From 514d67ef05420cad774704fe78ce419e822c1e45 Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Sun, 27 May 2007 09:37:16 +0000
Subject: [PATCH]
---
tests/ConnectionTestCase.php | 10 +++++-----
tests/PessimisticLockingTestCase.php | 5 ++---
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/tests/ConnectionTestCase.php b/tests/ConnectionTestCase.php
index e531b1575..b9980d23b 100644
--- a/tests/ConnectionTestCase.php
+++ b/tests/ConnectionTestCase.php
@@ -135,7 +135,7 @@ class Doctrine_Connection_TestCase extends Doctrine_UnitTestCase {
}
public function testDelete() {
$user = $this->connection->create('User');
- $this->connection->delete($user);
+ $this->connection->unitOfWork->delete($user);
$this->assertEqual($user->state(),Doctrine_Record::STATE_TCLEAN);
}
public function testGetTable() {
@@ -185,15 +185,15 @@ class Doctrine_Connection_TestCase extends Doctrine_UnitTestCase {
$this->assertEqual($this->connection->transaction->getTransactionLevel(),0);
$this->connection->beginTransaction();
$this->assertEqual($this->connection->transaction->getTransactionLevel(),1);
- $this->assertEqual($this->connection->transaction->getState(),Doctrine_Transaction::STATE_ACTIVE);
+ $this->assertEqual($this->connection->transaction->getState(), Doctrine_Transaction::STATE_ACTIVE);
$this->connection->beginTransaction();
- $this->assertEqual($this->connection->transaction->getState(),Doctrine_Transaction::STATE_BUSY);
+ $this->assertEqual($this->connection->transaction->getState(), Doctrine_Transaction::STATE_BUSY);
$this->assertEqual($this->connection->transaction->getTransactionLevel(),2);
$this->connection->commit();
- $this->assertEqual($this->connection->transaction->getState(),Doctrine_Transaction::STATE_ACTIVE);
+ $this->assertEqual($this->connection->transaction->getState(), Doctrine_Transaction::STATE_ACTIVE);
$this->assertEqual($this->connection->transaction->getTransactionLevel(),1);
$this->connection->commit();
- $this->assertEqual($this->connection->transaction->getState(),Doctrine_Transaction::STATE_SLEEP);
+ $this->assertEqual($this->connection->transaction->getState(), Doctrine_Transaction::STATE_SLEEP);
$this->assertEqual($this->connection->transaction->getTransactionLevel(),0);
}
}
diff --git a/tests/PessimisticLockingTestCase.php b/tests/PessimisticLockingTestCase.php
index 489d7a9dc..ddb0e1ec6 100644
--- a/tests/PessimisticLockingTestCase.php
+++ b/tests/PessimisticLockingTestCase.php
@@ -38,8 +38,7 @@ class Doctrine_PessimisticLocking_TestCase extends Doctrine_UnitTestCase {
*
* Creates a locking manager and a test record to work with.
*/
- public function setUp() {
- parent::setUp();
+ public function testInitData() {
$this->lockingManager = new Doctrine_Locking_Manager_Pessimistic($this->connection);
// Create sample data to test on
@@ -97,7 +96,7 @@ class Doctrine_PessimisticLocking_TestCase extends Doctrine_UnitTestCase {
$released = $this->lockingManager->releaseAgedLocks(-1, 'Forum_Entry', 'romanb'); // should release the lock
$this->assertEqual(1, $released);
}
-
+
/**
* Tests the retrieving of a lock's owner.
* This test implicitly tests getLock().