From 35562d3a4d70a2bc0f215ed8fcccfa76b1c66064 Mon Sep 17 00:00:00 2001 From: Benjamin Morel Date: Tue, 12 Feb 2013 15:51:24 +0000 Subject: [PATCH] Unit tests: cleaned up outdated / unused / commented out code. --- tests/Doctrine/Tests/Mocks/DriverMock.php | 14 -------- .../Tests/Mocks/EntityManagerMock.php | 22 ------------- .../Tests/Mocks/EntityPersisterMock.php | 19 ----------- .../Tests/Mocks/HydratorMockStatement.php | 17 +--------- .../Tests/Mocks/IdentityIdGeneratorMock.php | 16 ---------- tests/Doctrine/Tests/Mocks/SequenceMock.php | 32 ------------------- tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php | 22 ------------- tests/Doctrine/Tests/ORM/UnitOfWorkTest.php | 7 ---- 8 files changed, 1 insertion(+), 148 deletions(-) delete mode 100644 tests/Doctrine/Tests/Mocks/IdentityIdGeneratorMock.php diff --git a/tests/Doctrine/Tests/Mocks/DriverMock.php b/tests/Doctrine/Tests/Mocks/DriverMock.php index c7a101094..af9f869ce 100644 --- a/tests/Doctrine/Tests/Mocks/DriverMock.php +++ b/tests/Doctrine/Tests/Mocks/DriverMock.php @@ -25,20 +25,6 @@ class DriverMock implements \Doctrine\DBAL\Driver return new DriverConnectionMock(); } - /** - * Constructs the Sqlite PDO DSN. - * - * @param array $params - * - * @return string The DSN. - * - * @override - */ - protected function _constructPdoDsn(array $params) - { - return ""; - } - /** * {@inheritdoc} */ diff --git a/tests/Doctrine/Tests/Mocks/EntityManagerMock.php b/tests/Doctrine/Tests/Mocks/EntityManagerMock.php index 91f1c9daa..b27e96c4b 100644 --- a/tests/Doctrine/Tests/Mocks/EntityManagerMock.php +++ b/tests/Doctrine/Tests/Mocks/EntityManagerMock.php @@ -38,11 +38,6 @@ class EntityManagerMock extends \Doctrine\ORM\EntityManager */ private $_proxyFactoryMock; - /** - * @var array - */ - private $_idGenerators = array(); - /** * {@inheritdoc} */ @@ -103,21 +98,4 @@ class EntityManagerMock extends \Doctrine\ORM\EntityManager return new EntityManagerMock($conn, $config, $eventManager); } -/* - public function setIdGenerator($className, $generator) - { - $this->_idGenerators[$className] = $generator; - } -*/ - /** @override */ -/* public function getIdGenerator($className) - { - - if (isset($this->_idGenerators[$className])) { - return $this->_idGenerators[$className]; - } - - return parent::getIdGenerator($className); - } - */ } diff --git a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php index 862000eb5..41b74607d 100644 --- a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php +++ b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php @@ -42,25 +42,6 @@ class EntityPersisterMock extends \Doctrine\ORM\Persisters\BasicEntityPersister */ private $existsCalled = false; - /** - * @param object $entity - * - * @return mixed - * - * @override - */ - public function insert($entity) - { - $this->inserts[] = $entity; - if ( ! is_null($this->mockIdGeneratorType) && $this->mockIdGeneratorType == \Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_IDENTITY - || $this->class->isIdGeneratorIdentity()) { - $id = $this->identityColumnValueCounter++; - $this->postInsertIds[$id] = $entity; - return $id; - } - return null; - } - /** * @param object $entity * diff --git a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php index 6c9ff6b8b..9d06ba6b8 100644 --- a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php +++ b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php @@ -68,21 +68,6 @@ class HydratorMockStatement implements \IteratorAggregate, \Doctrine\DBAL\Driver return true; } - /** - * @param array $resultSet - * - * @return void - */ - public function setResultSet(array $resultSet) - { - reset($resultSet); - $this->_resultSet = $resultSet; - } - - public function bindColumn($column, &$param, $type = null) - { - } - /** * {@inheritdoc} */ @@ -93,7 +78,7 @@ class HydratorMockStatement implements \IteratorAggregate, \Doctrine\DBAL\Driver /** * {@inheritdoc} */ - public function bindParam($column, &$variable, $type = null, $length = null, $driverOptions = array()) + public function bindParam($column, &$variable, $type = null) { } diff --git a/tests/Doctrine/Tests/Mocks/IdentityIdGeneratorMock.php b/tests/Doctrine/Tests/Mocks/IdentityIdGeneratorMock.php deleted file mode 100644 index 868b7fe44..000000000 --- a/tests/Doctrine/Tests/Mocks/IdentityIdGeneratorMock.php +++ /dev/null @@ -1,16 +0,0 @@ -_mockPostInsertId = $id; - } -} diff --git a/tests/Doctrine/Tests/Mocks/SequenceMock.php b/tests/Doctrine/Tests/Mocks/SequenceMock.php index 8612e0d27..4f5123004 100644 --- a/tests/Doctrine/Tests/Mocks/SequenceMock.php +++ b/tests/Doctrine/Tests/Mocks/SequenceMock.php @@ -22,30 +22,6 @@ class SequenceMock extends \Doctrine\ORM\Id\SequenceGenerator return $this->_sequenceNumber++; } - /** - * @override - */ - public function nextId($seqName, $ondemand = true) - { - return $this->_sequenceNumber++; - } - - /** - * @override - */ - public function lastInsertId($table = null, $field = null) - { - return $this->_sequenceNumber - 1; - } - - /** - * @override - */ - public function currId($seqName) - { - return $this->_sequenceNumber; - } - /* Mock API */ /** @@ -55,12 +31,4 @@ class SequenceMock extends \Doctrine\ORM\Id\SequenceGenerator { $this->_sequenceNumber = 0; } - - /** - * @return void - */ - public function autoinc() - { - $this->_sequenceNumber++; - } } diff --git a/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php b/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php index 95c511c70..0dd0671d0 100644 --- a/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php +++ b/tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php @@ -52,28 +52,6 @@ class UnitOfWorkMock extends \Doctrine\ORM\UnitOfWork $this->_persisterMock[$entityName] = $persister; } - /** - * @param object $entity - * @param array $mockChangeSet - * - * @return void - */ - public function setDataChangeSet($entity, array $mockChangeSet) - { - $this->_mockDataChangeSets[spl_object_hash($entity)] = $mockChangeSet; - } - - /** - * @param object $entity - * @param mixed $state - * - * @return void - */ - public function setEntityState($entity, $state) - { - $this->_entityStates[spl_object_hash($entity)] = $state; - } - /** * {@inheritdoc} */ diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php index e091483e3..9a645d52e 100644 --- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php +++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php @@ -7,7 +7,6 @@ use Doctrine\Tests\Mocks\ConnectionMock; use Doctrine\Tests\Mocks\EntityManagerMock; use Doctrine\Tests\Mocks\UnitOfWorkMock; use Doctrine\Tests\Mocks\EntityPersisterMock; -use Doctrine\Tests\Mocks\IdentityIdGeneratorMock; use Doctrine\Tests\Models\Forum\ForumUser; use Doctrine\Tests\Models\Forum\ForumAvatar; @@ -54,8 +53,6 @@ class UnitOfWorkTest extends \Doctrine\Tests\OrmTestCase // Setup fake persister and id generator for identity generation $userPersister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata("Doctrine\Tests\Models\Forum\ForumUser")); $this->_unitOfWork->setEntityPersister('Doctrine\Tests\Models\Forum\ForumUser', $userPersister); - //$idGeneratorMock = new IdentityIdGeneratorMock($this->_emMock); - //$this->_emMock->setIdGenerator('Doctrine\Tests\Models\Forum\ForumUser', $idGeneratorMock); $userPersister->setMockIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_IDENTITY); // Test @@ -96,14 +93,10 @@ class UnitOfWorkTest extends \Doctrine\Tests\OrmTestCase //ForumUser $userPersister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata("Doctrine\Tests\Models\Forum\ForumUser")); $this->_unitOfWork->setEntityPersister('Doctrine\Tests\Models\Forum\ForumUser', $userPersister); - //$userIdGeneratorMock = new IdentityIdGeneratorMock($this->_emMock); - //$this->_emMock->setIdGenerator('Doctrine\Tests\Models\Forum\ForumUser', $userIdGeneratorMock); $userPersister->setMockIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_IDENTITY); // ForumAvatar $avatarPersister = new EntityPersisterMock($this->_emMock, $this->_emMock->getClassMetadata("Doctrine\Tests\Models\Forum\ForumAvatar")); $this->_unitOfWork->setEntityPersister('Doctrine\Tests\Models\Forum\ForumAvatar', $avatarPersister); - //$avatarIdGeneratorMock = new IdentityIdGeneratorMock($this->_emMock); - //$this->_emMock->setIdGenerator('Doctrine\Tests\Models\Forum\ForumAvatar', $avatarIdGeneratorMock); $avatarPersister->setMockIdGeneratorType(\Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_IDENTITY); // Test