From 1590e238689bd244ff59d183cc8cf3225f6bcd64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 9 May 2014 11:56:45 +0200 Subject: [PATCH] We no longer need to mock the dbi object MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- test/classes/dbi/DBIDrizzle_test.php | 11 ++--------- test/classes/dbi/DBIMysqli_test.php | 7 ------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/test/classes/dbi/DBIDrizzle_test.php b/test/classes/dbi/DBIDrizzle_test.php index f34907d29a..7ea61fe367 100644 --- a/test/classes/dbi/DBIDrizzle_test.php +++ b/test/classes/dbi/DBIDrizzle_test.php @@ -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() ); diff --git a/test/classes/dbi/DBIMysqli_test.php b/test/classes/dbi/DBIMysqli_test.php index cb1087e03b..e42348cde5 100644 --- a/test/classes/dbi/DBIMysqli_test.php +++ b/test/classes/dbi/DBIMysqli_test.php @@ -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; } /**