Fix tests for #13788 - Exporting a view structure

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Dec 21, 2018 · d327674 · d327674
1 parent a5b50b3
commit d327674
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php
@@ -965,13 +965,15 @@ public function testGetTableDef()
             ->with('res')
             ->will($this->returnValue($tmpres));
 
-        $dbi->expects($this->exactly(2))
+        $dbi->expects($this->exactly(3))
             ->method('tryQuery')
             ->withConsecutive(
                 array("SHOW TABLE STATUS FROM `db` WHERE Name = 'table'"),
+                array('USE `db`'),
                 array('SHOW CREATE TABLE `db`.`table`')
             )
             ->willReturnOnConsecutiveCalls(
+                'res',
                 'res',
                 'res'
             );
@@ -1139,13 +1141,15 @@ public function testGetTableDefWithError()
             ->with('res')
             ->will($this->returnValue($tmpres));
 
-        $dbi->expects($this->exactly(2))
+        $dbi->expects($this->exactly(3))
             ->method('tryQuery')
             ->withConsecutive(
                 array("SHOW TABLE STATUS FROM `db` WHERE Name = 'table'"),
+                array('USE `db`'),
                 array('SHOW CREATE TABLE `db`.`table`')
             )
             ->willReturnOnConsecutiveCalls(
+                'res',
                 'res',
                 'res'
             );

diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php
@@ -254,13 +254,15 @@ public function testCreateVersion()
                 'Update_time' => '2013-02-22 21:46:48'
             )
         );
-        $dbi->expects($this->exactly(2))
+        $dbi->expects($this->exactly(3))
             ->method('tryQuery')
             ->withConsecutive(
                 array("SHOW TABLE STATUS FROM `pma_test` WHERE Name = 'pma_tbl'"),
+                array('USE `pma_test`'),
                 array('SHOW CREATE TABLE `pma_test`.`pma_tbl`')
             )
             ->willReturnOnConsecutiveCalls(
+                'res',
                 'res',
                 'res'
             );