Testing minimal and simply

Author: bigfoot90

tests/Utils/FormatterTest.php

@@ -253,17 +253,41 @@ public function formatQueries_new()
                 'cli' => "\x1b[0m",
                 'html' => '',
             ),
+            'minimal' => array(
+                'query' => 'select 1',
+                'text' =>
+                    'SELECT' . "\n" .
+                    '    1',
+                'cli' =>
+                    "\x1b[35mSELECT" . "\n" .
+                    "    \x1b[92m1" . "\x1b[0m",
+                'html' =>
+                    '<span class="sql-reserved">SELECT</span>' . '<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-number">1</span>',
+            ),
             'simply' => array(
-                'query' => 'select *',
+                'query' => 'select * from tbl where 1',
                 'text' =>
                     'SELECT' . "\n" .
-                    '    *',
+                    '    *' . "\n" .
+                    'FROM' . "\n" .
+                    '    tbl' . "\n" .
+                    'WHERE' . "\n" .
+                    '    1',
                 'cli' =>
                     "\x1b[35mSELECT" . "\n" .
-                    "    \x1b[39m*" . "\x1b[0m",
+                    "    \x1b[39m*" . "\n" .
+                    "\x1b[35mFROM" . "\n" .
+                    "    \x1b[39mtbl" . "\n" .
+                    "\x1b[35mWHERE" . "\n" .
+                    "    \x1b[92m1" . "\x1b[0m",
                 'html' =>
                     '<span class="sql-reserved">SELECT</span>' . '<br/>' .
-                    '&nbsp;&nbsp;&nbsp;&nbsp;*',
+                    '&nbsp;&nbsp;&nbsp;&nbsp;*' . '<br/>' .
+                    '<span class="sql-reserved">FROM</span>' . '<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;tbl' . '<br/>' .
+                    '<span class="sql-reserved">WHERE</span>' . '<br/>' .
+                    '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-number">1</span>',
             ),
             'comments' => array(
                 'query' =>
@@ -483,7 +507,7 @@ public function testFormat($query, $expected, $options)
     public function formatQueries()
     {
         return array(
-            array(  # Covered by 'simply'
+            array(  # Covered by 'minimal'
                 'SELECT 1',
                 '<span class="sql-reserved">SELECT</span>' . '<br/>' .
                 '&nbsp;&nbsp;&nbsp;&nbsp;<span class="sql-number">1</span>',
@@ -557,7 +581,7 @@ public function formatQueries()
                 '(<span class="sql-number">1</span>, <span class="sql-number">1</span>, <span class="sql-number">1</span>)',
                 array('type' => 'html'),
             ),
-            array(  # Covered by 'simply'
+            array(  # Covered by 'minimal'
                 'SELECT 1',
                 "\x1b[35mSELECT\n    \x1b[92m1\x1b[0m",
                 array('type' => 'cli'),