gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We no longer need to mock the dbi object

Browse Source 
Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2014-05-09 11:56:45 +02:00
parent c3fab4b047
commit 1590e23868
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/classes/dbi/DBIDrizzle_test.php
View File

@ -76,13 +76,6 @@ class PMA_DBI_Drizzle_Test extends PHPUnit_Framework_TestCase
$_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
$_SESSION['PMA_Theme'] = new PMA_Theme();
//Mock DBI, just for postConnect usage
$dbi = $this->getMockBuilder('PMA_DatabaseInterface')
->disableOriginalConstructor()
->getMock();
$GLOBALS['dbi'] = $dbi;
$this->object = new PMA_DBI_Drizzle();
}
@ -215,7 +208,7 @@ class PMA_DBI_Drizzle_Test extends PHPUnit_Framework_TestCase
//$server = null;
$link = $this->object->connect($user, $password);
$this->assertEquals(
"DrizzleCon_addTcp",
"DrizzleCon_addUds",
$link->getType()
);
@ -223,7 +216,7 @@ class PMA_DBI_Drizzle_Test extends PHPUnit_Framework_TestCase
$server['host'] = 'host';
$link = $this->object->connect($user, $password);
$this->assertEquals(
"DrizzleCon_addTcp",
"DrizzleCon_addUds",
$link->getType()
);

7
test/classes/dbi/DBIMysqli_test.php
View File

@ -50,13 +50,6 @@ class PMA_DBI_Mysqli_Test extends PHPUnit_Framework_TestCase
$_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
$_SESSION['PMA_Theme'] = new PMA_Theme();
$this->object = new PMA_DBI_Mysqli();
//Mock DBI, just for postConnect usage
$dbi = $this->getMockBuilder('PMA_DatabaseInterface')
->disableOriginalConstructor()
->getMock();
$GLOBALS['dbi'] = $dbi;
}
/**