From 10a4b87979794e1577d273ba98810a5dcbbad073 Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Tue, 24 Apr 2012 22:28:47 -0400
Subject: [PATCH] Fixed tests with nested transaction in DboSource.

---
 .../Test/Case/Model/Datasource/DboSourceTest.php   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
index a1f1c6f02..16952bb57 100644
--- a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
@@ -35,7 +35,7 @@ class MockDataSource extends DataSource {
 
 class DboTestSource extends DboSource {
 
-	public static $nested = true;
+	public $nestedSupport = false;
 
 	public function connect($config = array()) {
 		$this->connected = true;
@@ -54,7 +54,7 @@ class DboTestSource extends DboSource {
 	}
 
 	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');
 		$db = new DboTestSource();
 		$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(1))->method('exec')->with($this->equalTo('SAVEPOINT LEVEL1'))->will($this->returnValue(true));
@@ -870,8 +871,8 @@ class DboSourceTest extends CakeTestCase {
 		$conn = $this->getMock('MockPDO');
 		$db = new DboTestSource();
 		$db->setConnection($conn);
-		$db->nestedTransaction = false;
-		DboTestSource::$nested = true;
+		$db->nestedTransaction = true;
+		$db->nestedSupport = false;
 
 		$conn->expects($this->once())->method('beginTransaction')->will($this->returnValue(true));
 		$conn->expects($this->never())->method('exec');
@@ -889,7 +890,8 @@ class DboSourceTest extends CakeTestCase {
 		$conn = $this->getMock('MockPDO');
 		$db = new DboTestSource();
 		$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->never())->method('exec');