adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed tests with nested transaction in DboSource.

Browse source
This commit is contained in:
Juan Basso 2012-04-24 22:28:47 -04:00
parent 5bec15d3e1
commit 10a4b87979
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
View file

@ -35,7 +35,7 @@ class MockDataSource extends DataSource {
class DboTestSource extends DboSource { class DboTestSource extends DboSource {
public static $nested = true; public $nestedSupport = false;
public function connect($config = array()) { public function connect($config = array()) {
$this->connected = true; $this->connected = true;
@ -54,7 +54,7 @@ class DboTestSource extends DboSource {
} }
public function supportNestedTransaction() { public function supportNestedTransaction() {
return $this->nestedTransaction && self::$nested; return $this->nestedTransaction && $this->nestedSupport;
} }
} }
@ -849,7 +849,8 @@ class DboSourceTest extends CakeTestCase {
$conn = $this->getMock('MockPDO'); $conn = $this->getMock('MockPDO');
$db = new DboTestSource(); $db = new DboTestSource();
$db->setConnection($conn); $db->setConnection($conn);
DboTestSource::$nested = true; $db->nestedTransaction = true;
$db->nestedSupport = true;
$conn->expects($this->at(0))->method('beginTransaction')->will($this->returnValue(true)); $conn->expects($this->at(0))->method('beginTransaction')->will($this->returnValue(true));
$conn->expects($this->at(1))->method('exec')->with($this->equalTo('SAVEPOINT LEVEL1'))->will($this->returnValue(true)); $conn->expects($this->at(1))->method('exec')->with($this->equalTo('SAVEPOINT LEVEL1'))->will($this->returnValue(true));
@ -870,8 +871,8 @@ class DboSourceTest extends CakeTestCase {
$conn = $this->getMock('MockPDO'); $conn = $this->getMock('MockPDO');
$db = new DboTestSource(); $db = new DboTestSource();
$db->setConnection($conn); $db->setConnection($conn);
$db->nestedTransaction = false; $db->nestedTransaction = true;
DboTestSource::$nested = true; $db->nestedSupport = false;
$conn->expects($this->once())->method('beginTransaction')->will($this->returnValue(true)); $conn->expects($this->once())->method('beginTransaction')->will($this->returnValue(true));
$conn->expects($this->never())->method('exec'); $conn->expects($this->never())->method('exec');
@ -889,7 +890,8 @@ class DboSourceTest extends CakeTestCase {
$conn = $this->getMock('MockPDO'); $conn = $this->getMock('MockPDO');
$db = new DboTestSource(); $db = new DboTestSource();
$db->setConnection($conn); $db->setConnection($conn);
DboTestSource::$nested = false; $db->nestedTransaction = false;
$db->nestedSupport = true;
$conn->expects($this->once())->method('beginTransaction')->will($this->returnValue(true)); $conn->expects($this->once())->method('beginTransaction')->will($this->returnValue(true));
$conn->expects($this->never())->method('exec'); $conn->expects($this->never())->method('exec');