wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moving setExpectedException

Browse Source
This commit is contained in:
Vyacheslav Agafonov
2011-12-02 12:25:47 +04:00
parent 1f1551aea1
commit 0fda3de8b5
16 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/model/DbDriverTest.php
View File

@ -39,8 +39,10 @@ class DbDriverTest extends PHPUnit_Framework_TestCase
public function testConstructWrongConfig()
{
$this->setExpectedException('GeneralException', 'Configuration must have a "username"');
$conf = array('hostname' => 'localhost', 'database' => 'db');
$this->setExpectedException('GeneralException', 'Configuration must have a "username"');
$this->getMockForAbstractClass('DbDriver', array($conf));
}

2
tests/model/DbStatementTest.php
View File

@ -69,8 +69,8 @@ class DbStatementTest extends PHPUnit_Framework_TestCase
public function testBindParamExceptionWrongObject()
{
$this->setExpectedException('GeneralException', 'Objects excepts DbExpr not allowed.');
$val = $this->getMock('NotDbExpr');
$this->setExpectedException('GeneralException', 'Objects excepts DbExpr not allowed.');
$this->stmt->bindParam('paa', $val);
}

3
tests/model/DbTest.php
View File

@ -49,9 +49,8 @@ class DbTest extends PHPUnit_Framework_TestCase
public function testConnectWithWrongDriver()
{
$this->setExpectedException('InitializationException', 'Database driver must extends DbDriver');
$this->getMock('NotDbDriver', array(), array(), 'NoDbDriverMock');
$this->setExpectedException('InitializationException', 'Database driver must extends DbDriver');
$driver = Db::connect('nodb', array('hostname' => 'localhost', 'driver' => 'NoDbDriverMock'));
}
}

5
tests/model/MySQLiDriverTest.php
View File

@ -85,10 +85,11 @@ class MySQLiDriverTest extends PHPUnit_Extensions_Database_TestCase
if (!defined('DEBUG')) {
define('DEBUG', false);
}
$this->setExpectedException('GeneralException', 'Unknown database \'nodb\'');
$this->conf['database'] = 'nodb';
$driver = new MySQLiDriver($this->conf);
$this->setExpectedException('GeneralException', 'Unknown database \'nodb\'');
$this->assertNull('mysqli', $driver->getConnection());
}

6
tests/model/MySQLiStatementTest.php
View File

@ -70,8 +70,8 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase
if (!defined('DEBUG')) {
define('DEBUG', false);
}
$this->setExpectedException('GeneralException', 'ERROR');
$this->setDriverGetConnectionWrongResultMethod();
$this->setExpectedException('GeneralException', 'ERROR');
$this->stmt->execute(array('place' => 'place_val', 'new' => 'new_val'));
}
@ -174,9 +174,11 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase
if (!defined('DEBUG')) {
define('DEBUG', false);
}
$this->setExpectedException('GeneralException');
$this->setDriverGetConnectionMethod();
$this->stmt->execute(array('place' => 'place_val', 'new' => 'new_val'));
$this->setExpectedException('GeneralException');
$this->stmt->fetch(324);
}