Skip to content

Commit 96a904a

Browse files
bigfoot90bigfoot90
committed
Remove old tests and fix method names 'formatQueries' and 'testFormat'
1 parent 305b897 commit 96a904a

1 file changed

Lines changed: 3 additions & 148 deletions

File tree

‎tests/Utils/FormatterTest.php‎

Lines changed: 3 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,9 @@ public function mergeFormats()
230230
}
231231

232232
/**
233-
* @dataProvider formatQueries_new
233+
* @dataProvider formatQueries
234234
*/
235-
public function testFormat_new($query, $text, $cli, $html, array $options = array())
235+
public function testFormat($query, $text, $cli, $html, array $options = array())
236236
{
237237
// Test TEXT format
238238
$this->assertEquals($text, Formatter::format($query, array('type' => 'text') + $options), 'Text formatting failed.');
@@ -244,7 +244,7 @@ public function testFormat_new($query, $text, $cli, $html, array $options = arra
244244
$this->assertEquals($html, Formatter::format($query, array('type' => 'html') + $options), 'HTML formatting failed.');
245245
}
246246

247-
public function formatQueries_new()
247+
public function formatQueries()
248248
{
249249
return array(
250250
'empty' => array(
@@ -537,149 +537,4 @@ public function formatQueries_new()
537537
),
538538
);
539539
}
540-
541-
/**
542-
* @dataProvider formatQueries
543-
*/
544-
public function testFormat($query, $expected, $options)
545-
{
546-
$this->assertEquals(
547-
$expected,
548-
Formatter::format($query, $options)
549-
);
550-
}
551-
552-
public function formatQueries()
553-
{
554-
return array(
555-
array( # Covered by 'minimal'
556-
'SELECT 1',
557-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
558-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-number">1</span>',
559-
array('type' => 'html'),
560-
),
561-
array( # Covered by 'comments'
562-
'SELECT /* Comment */ 1' . "\n" .
563-
'FROM tbl # Comment' . "\n" .
564-
'WHERE 1 -- Comment',
565-
'SELECT' . "\n" .
566-
' /* Comment */ 1' . "\n" .
567-
'FROM' . "\n" .
568-
' tbl # Comment' . "\n" .
569-
'WHERE' . "\n" .
570-
' 1 -- Comment',
571-
array('type' => 'text'),
572-
),
573-
array( # Covered by 'comments'
574-
'SELECT 1 # Comment',
575-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
576-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-number">1</span> <span class="sql-comment"># Comment</span>',
577-
array('type' => 'html'),
578-
),
579-
array( # Covered by 'comments'
580-
'SELECT 1 -- comment',
581-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
582-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-number">1</span> <span class="sql-comment">-- comment</span>',
583-
array('type' => 'html'),
584-
),
585-
array( # Covered by 'strip comments'
586-
'SELECT 1 -- comment',
587-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
588-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-number">1</span>',
589-
array('type' => 'html', 'remove_comments' => true),
590-
),
591-
array( # Covered by 'keywords'
592-
'SELECT HEX("1")',
593-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
594-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-keyword">HEX</span>(<span class="sql-string">"1"</span>)',
595-
array('type' => 'html'),
596-
),
597-
array(
598-
'SELECT * FROM foo WHERE bar=1',
599-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
600-
'&nbsp;&nbsp;&nbsp;&nbsp;*' . '<br/>' .
601-
'<span class="sql-reserved">FROM</span>' . '<br/>' .
602-
'&nbsp;&nbsp;&nbsp;&nbsp;foo' . '<br/>' .
603-
'<span class="sql-reserved">WHERE</span>' . '<br/>' .
604-
'&nbsp;&nbsp;&nbsp;&nbsp;bar = <span class="sql-number">1</span>',
605-
array('type' => 'html'),
606-
),
607-
array( # Covered by 'create procedure'
608-
'CREATE PROCEDURE SPTEST() BEGIN FROM a SELECT *; END',
609-
'<span class="sql-reserved">CREATE</span>' . '<br/>' .
610-
'<span class="sql-reserved">PROCEDURE</span> SPTEST()' . '<br/>' .
611-
'<span class="sql-keyword">BEGIN</span>' . '<br/>' .
612-
'<span class="sql-reserved">FROM</span>' . '<br/>' .
613-
'&nbsp;&nbsp;&nbsp;&nbsp;a' . '<br/>' .
614-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
615-
'&nbsp;&nbsp;&nbsp;&nbsp;*;' . '<br/>' .
616-
'<span class="sql-keyword">END</span>',
617-
array('type' => 'html'),
618-
),
619-
array( # Covered by 'insert'
620-
'INSERT INTO foo VALUES (0, 0, 0), (1, 1, 1)',
621-
'<span class="sql-reserved">INSERT</span>' . '<br/>' .
622-
'<span class="sql-reserved">INTO</span>' . '<br/>' .
623-
'&nbsp;&nbsp;&nbsp;&nbsp;foo' . '<br/>' .
624-
'<span class="sql-reserved">VALUES</span>' .
625-
'(<span class="sql-number">0</span>, <span class="sql-number">0</span>, <span class="sql-number">0</span>),' .
626-
'(<span class="sql-number">1</span>, <span class="sql-number">1</span>, <span class="sql-number">1</span>)',
627-
array('type' => 'html'),
628-
),
629-
array( # Covered by 'minimal'
630-
'SELECT 1',
631-
"\x1b[35mSELECT\n \x1b[92m1\x1b[0m",
632-
array('type' => 'cli'),
633-
),
634-
array( # Covered by 'string as alias'
635-
'SELECT "Text" AS BAR',
636-
"\x1b[35mSELECT\n \x1b[91m\"Text\" \x1b[35mAS \x1b[39mBAR\x1b[0m",
637-
array('type' => 'cli'),
638-
),
639-
array( # Covered by 'typical' and 'string as alias'
640-
'SELECT coditm AS Item, descripcion AS Descripcion, contenedores AS Contenedores, IF(suspendido = 1, Si, NO) AS Suspendido FROM `DW_articulos` WHERE superado = 0',
641-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
642-
'&nbsp;&nbsp;&nbsp;&nbsp;coditm <span class="sql-reserved">AS</span> Item,' . '<br/>' .
643-
'&nbsp;&nbsp;&nbsp;&nbsp;descripcion <span class="sql-reserved">AS</span> Descripcion,' . '<br/>' .
644-
'&nbsp;&nbsp;&nbsp;&nbsp;contenedores <span class="sql-reserved">AS</span> Contenedores,' . '<br/>' .
645-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-reserved">IF</span>(suspendido = <span class="sql-number">1</span>, Si, <span class="sql-keyword">NO</span>) <span class="sql-reserved">AS</span> Suspendido' . '<br/>' .
646-
'<span class="sql-reserved">FROM</span>' . '<br/>' .
647-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`DW_articulos`</span>' . '<br/>' .
648-
'<span class="sql-reserved">WHERE</span>' . '<br/>' .
649-
'&nbsp;&nbsp;&nbsp;&nbsp;superado = <span class="sql-number">0</span>',
650-
array('type' => 'html'),
651-
),
652-
array( # Covered by 'create table'
653-
'CREATE TABLE IF NOT EXISTS `pma__bookmark` (' . "\n" .
654-
' `id` int(11) NOT NULL auto_increment,' . "\n" .
655-
' `dbase` varchar(255) NOT NULL default "",' . "\n" .
656-
' `user` varchar(255) NOT NULL default "",' . "\n" .
657-
' `label` varchar(255) COLLATE utf8_general_ci NOT NULL default "",' . "\n" .
658-
' `query` text NOT NULL,' . "\n" .
659-
' PRIMARY KEY (`id`)' . "\n",
660-
'<span class="sql-reserved">CREATE</span> <span class="sql-reserved">TABLE</span> <span class="sql-reserved">IF NOT EXISTS</span> <span class="sql-variable">`pma__bookmark`</span>(' . '<br/>' .
661-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`id`</span> <span class="sql-reserved">INT</span>(<span class="sql-number">11</span>) <span class="sql-reserved">NOT NULL</span> <span class="sql-keyword">AUTO_INCREMENT</span>,' . '<br/>' .
662-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`dbase`</span> <span class="sql-reserved">VARCHAR</span>(<span class="sql-number">255</span>) <span class="sql-reserved">NOT NULL</span> <span class="sql-reserved">DEFAULT</span> <span class="sql-string">""</span>,' . '<br/>' .
663-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`user`</span> <span class="sql-reserved">VARCHAR</span>(<span class="sql-number">255</span>) <span class="sql-reserved">NOT NULL</span> <span class="sql-reserved">DEFAULT</span> <span class="sql-string">""</span>,' . '<br/>' .
664-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`label`</span> <span class="sql-reserved">VARCHAR</span>(<span class="sql-number">255</span>) <span class="sql-reserved">COLLATE</span> utf8_general_ci <span class="sql-reserved">NOT NULL</span> <span class="sql-reserved">DEFAULT</span> <span class="sql-string">""</span>,' . '<br/>' .
665-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`query`</span> <span class="sql-keyword">TEXT</span> <span class="sql-reserved">NOT NULL</span>,' . '<br/>' .
666-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-reserved">PRIMARY KEY</span>(<span class="sql-variable">`id`</span>)',
667-
array('type' => 'html'),
668-
),
669-
array( # Covered by 'escape html'
670-
"select '<s>xss' from `<s>xss` , <s>nxss /*s<s>xss*/",
671-
'<span class="sql-reserved">SELECT</span>' . '<br/>' .
672-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-string">\'&lt;s&gt;xss\'</span>' . '<br/>' .
673-
'<span class="sql-reserved">FROM</span>' . '<br/>' .
674-
'&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-variable">`&lt;s&gt;xss`</span>,' . '<br/>' .
675-
'&nbsp;&nbsp;&nbsp;&nbsp;&lt; s &gt; nxss <span class="sql-comment">/*s&lt;s&gt;xss*/</span>',
676-
array('type' => 'html'),
677-
),
678-
array( # Covered by 'escape cli'
679-
"select 'text\x1b[33mcolor-inj' from tbl",
680-
"\x1b[35mSELECT\n \x1b[91m'text\\x1B[33mcolor-inj'\n\x1b[35mFROM\n \x1b[39mtbl\x1b[0m",
681-
array('type' => 'cli'),
682-
),
683-
);
684-
}
685540
}

0 commit comments

Comments
 (0)