Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

1 files changed, 6 insertions, 6 deletions

diff --git a/test/classes/PMA_Footer_test.php b/test/classes/PMA_Footer_test.php
index 47968d9d1b..3b64f7314d 100644
--- a/test/classes/PMA_Footer_test.php
+++ b/test/classes/PMA_Footer_test.php
@@ -111,23 +111,23 @@ class PMA_Footer_Test extends PHPUnit_Framework_TestCase
      */
     public function testGetDebugMessage()
     {
-
+        $GLOBALS['cfg']['DBG']['sql'] = true;
         $_SESSION['debug']['queries'] = array(
-            'abc' => array(
+            array(
                 'count' => 1,
                 'time' => 0.2,
                 'query' => 'SELECT * FROM `pma_bookmark` WHERE 1',
             ),
-            'def' => array(
+            array(
                 'count' => 1,
                 'time' => 2.5,
                 'query' => 'SELECT * FROM `db` WHERE 1',
             ),
         );
 
-        $this->assertRegExp(
-            '/<div id="session_debug">2 queries executed 2 times in 2.7 seconds'
-            . '<pre>/',
+        $this->assertEquals(
+            '{"queries":[{"count":1,"time":0.2,"query":"SELECT * FROM `pma_bookmark` WHERE 1"},'
+            . '{"count":1,"time":2.5,"query":"SELECT * FROM `db` WHERE 1"}]}',
             $this->object->getDebugMessage()
         );
     }