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

remove expectedException from annotation

Browse Source
This commit is contained in:
Anton Grebnev
2011-12-06 16:22:04 +04:00
parent a942745039
commit 650f311b2b
3 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/model/MySQLiStatementTest.php
View File

@ -62,23 +62,17 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase
$this->assertTrue($this->stmt->bindParam('place', $val));
}
/**
* @expectedException GeneralException
* @expectedExceptionMessage Placeholder must be an integer or string
*/
public function testBindParamExceptionParam()
{
$val = 1;
$this->setExpectedException('GeneralException', 'Placeholder must be an integer or string');
$this->stmt->bindParam(array(), $val);
}
/**
* @expectedException GeneralException
* @expectedExceptionMessage Objects excepts DbExpr not allowed.
*/
public function testBindParamExceptionWrongObject()
{
$val = $this->getMock('NotDbExpr');
$this->setExpectedException('GeneralException', 'Objects excepts DbExpr not allowed.');
$this->stmt->bindParam('paa', $val);
}
@ -98,7 +92,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase
->will($this->returnCallback(array($this, 'driverQuote')));
$this->setDriverGetConnectionMethod();
$result = $this->stmt->execute(array('place' => 'place_val', 'new' => 'new_val'));
$this->assertTrue($result);
}
@ -112,7 +106,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase
define('DEBUG', false);
}
$this->setDriverGetConnectionMethod();
$this->sql = 'PLAIN SQL';
$result = $this->stmt->execute(array());
$this->assertTrue($result);
@ -214,7 +208,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase
->expects($this->any())
->method('getConnection')
->will($this->returnValue($mysqliMock));
$this->stmt->execute(array('place' => 'place_val', 'new' => 'new_val'));
$this->assertSame(array('pair' => 'value'), $this->stmt->fetchPairs());
}
@ -302,7 +296,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase
$this->stmt->execute(array('place' => 'place_val', 'new' => 'new_val'));
$this->setExpectedException('GeneralException');
$this->stmt->fetch(324);
}
@ -336,7 +330,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase
->method('query')
->with($this->anything())
->will($this->returnValue($resultMock));
$this->driver
->expects($this->any())
->method('getConnection')