Commit 514d67ef authored by zYne's avatar zYne

--no commit message

--no commit message
parent f8893f27
......@@ -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);
}
}
......
......@@ -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().
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment