From 4d43f5ca522003650038930836b7899a5268db07 Mon Sep 17 00:00:00 2001 From: Asmir Mustafic Date: Fri, 20 Feb 2015 10:12:40 +0100 Subject: [PATCH] Tested composite keys on non cache-able entities --- .../Tests/Models/Cache/ComplexAction.php | 77 +++++++++++++++++++ tests/Doctrine/Tests/Models/Cache/Token.php | 35 ++++++--- .../SecondLevelCacheManyToOneTest.php | 53 +++++++++++++ .../SecondLevelCacheOneToManyTest.php | 11 ++- .../Doctrine/Tests/OrmFunctionalTestCase.php | 2 + 5 files changed, 161 insertions(+), 17 deletions(-) create mode 100644 tests/Doctrine/Tests/Models/Cache/ComplexAction.php diff --git a/tests/Doctrine/Tests/Models/Cache/ComplexAction.php b/tests/Doctrine/Tests/Models/Cache/ComplexAction.php new file mode 100644 index 000000000..a42eba747 --- /dev/null +++ b/tests/Doctrine/Tests/Models/Cache/ComplexAction.php @@ -0,0 +1,77 @@ +name = $name; + $this->action1 = $action1; + $this->action2 = $action2; + $this->tokens = new ArrayCollection(); + } + + public function getAction1() + { + return $this->action1; + } + + public function getAction2() + { + return $this->action2; + } + + public function addToken(Token $token) + { + $this->tokens[] = $token; + $token->setComplexAction($this); + } + + public function getTokens() + { + return $this->tokens; + } + + public function getId() + { + return $this->id; + } + + public function getName() + { + return $this->name; + } +} diff --git a/tests/Doctrine/Tests/Models/Cache/Token.php b/tests/Doctrine/Tests/Models/Cache/Token.php index 39d04e3cc..09787e58f 100644 --- a/tests/Doctrine/Tests/Models/Cache/Token.php +++ b/tests/Doctrine/Tests/Models/Cache/Token.php @@ -41,14 +41,37 @@ class Token */ protected $action; + /** + * @ManyToOne(targetEntity="ComplexAction", cascade={"persist", "remove"}, inversedBy="tokens") + * @JoinColumns({ + * @JoinColumn(name="complex_action1_id", referencedColumnName="action1_id"), + * @JoinColumn(name="complex_action2_id", referencedColumnName="action2_id") + * }) + * @var ComplexAction + */ + protected $complexAction; + public function __construct($token, Client $client = null) { - $this->token = $token; $this->logins = new ArrayCollection(); + $this->token = $token; $this->client = $client; $this->expiresAt = new \DateTime(date('Y-m-d H:i:s', strtotime("+7 day"))); } + /** + * @return ComplexAction + */ + public function getComplexAction() + { + return $this->complexAction; + } + + public function setComplexAction(ComplexAction $complexAction) + { + $this->complexAction = $complexAction; + } + /** * @return array */ @@ -95,14 +118,4 @@ class Token { $this->token = $token; } - - public function setExpiresAt(DateTime $expiresAt) - { - $this->expiresAt = $expiresAt; - } - - public function setClient(Client $client) - { - $this->client = $client; - } } diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToOneTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToOneTest.php index 4eef64e56..d1e122970 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToOneTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToOneTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\Tests\Models\Cache\ComplexAction; use Doctrine\Tests\Models\Cache\Country; use Doctrine\Tests\Models\Cache\State; use Doctrine\ORM\Mapping\ClassMetadata; @@ -170,6 +171,58 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest $this->assertEquals('exec', $entity->getAction()->getName()); $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); + } + public function testPutAndLoadNonCacheableCompositeManyToOne() + { + $this->assertNull($this->cache->getEntityCacheRegion(Action::CLASSNAME)); + $this->assertNull($this->cache->getEntityCacheRegion(ComplexAction::CLASSNAME)); + $this->assertInstanceOf('Doctrine\ORM\Cache\Region', $this->cache->getEntityCacheRegion(Token::CLASSNAME)); + + $token = new Token('token-hash'); + + $action1 = new Action('login'); + $action2 = new Action('logout'); + $action3 = new Action('rememberme'); + + $complexAction = new ComplexAction($action1, $action3, 'login,rememberme'); + + $complexAction->addToken($token); + + $token->setAction($action2); + + $this->_em->persist($token); + + $this->_em->flush(); + $this->_em->clear(); + + $this->assertTrue($this->cache->containsEntity(Token::CLASSNAME, $token->getToken())); + $this->assertFalse($this->cache->containsEntity(Action::CLASSNAME, $action1->getId())); + $this->assertFalse($this->cache->containsEntity(Action::CLASSNAME, $action2->getId())); + $this->assertFalse($this->cache->containsEntity(Action::CLASSNAME, $action3->getId())); + + $queryCount = $this->getCurrentQueryCount(); + /** + * @var $entity Token + */ + $entity = $this->_em->find(Token::CLASSNAME, $token->getToken()); + + $this->assertInstanceOf(Token::CLASSNAME, $entity); + $this->assertEquals('token-hash', $entity->getToken()); + + $this->assertEquals($queryCount, $this->getCurrentQueryCount()); + + $this->assertInstanceOf(Action::CLASSNAME, $entity->getAction()); + $this->assertInstanceOf(ComplexAction::CLASSNAME, $entity->getComplexAction()); + $this->assertEquals($queryCount, $this->getCurrentQueryCount()); + + $this->assertInstanceOf(Action::CLASSNAME, $entity->getComplexAction()->getAction1()); + $this->assertInstanceOf(Action::CLASSNAME, $entity->getComplexAction()->getAction2()); + $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); + + $this->assertEquals('login', $entity->getComplexAction()->getAction1()->getName()); + $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount()); + $this->assertEquals('rememberme', $entity->getComplexAction()->getAction2()->getName()); + $this->assertEquals($queryCount + 3, $this->getCurrentQueryCount()); } } \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToManyTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToManyTest.php index 9ed1ea458..c028584d6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToManyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheOneToManyTest.php @@ -392,18 +392,17 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $l1 = new Login('session1'); $l2 = new Login('session2'); $token = new Token('token-hash'); + $token->addLogin($l1); + $token->addLogin($l2); $this->_em->persist($token); $this->_em->flush(); - $token->addLogin($l1); - $token->addLogin($l2); - $this->_em->flush(); $this->_em->clear(); - $queryCount = $this->getCurrentQueryCount(); - $this->assertTrue($this->cache->containsEntity(Token::CLASSNAME, $token->getToken())); + $queryCount = $this->getCurrentQueryCount(); + $entity = $this->_em->find(Token::CLASSNAME, $token->getToken()); $this->assertInstanceOf(Token::CLASSNAME, $entity); @@ -411,6 +410,6 @@ class SecondLevelCacheOneToManyTest extends SecondLevelCacheAbstractTest $this->assertEquals($queryCount, $this->getCurrentQueryCount()); $this->assertCount(2, $entity->getLogins()); - $this->assertEquals($queryCount + 1 , $this->getCurrentQueryCount()); + $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount()); } } diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 183f72231..b8cf89795 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -184,6 +184,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase 'Doctrine\Tests\Models\Cache\Login', 'Doctrine\Tests\Models\Cache\Client', 'Doctrine\Tests\Models\Cache\Action', + 'Doctrine\Tests\Models\Cache\ComplexAction', 'Doctrine\Tests\Models\Cache\AttractionInfo', 'Doctrine\Tests\Models\Cache\AttractionContactInfo', 'Doctrine\Tests\Models\Cache\AttractionLocationInfo' @@ -419,6 +420,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $conn->executeUpdate('DELETE FROM cache_state'); $conn->executeUpdate('DELETE FROM cache_country'); $conn->executeUpdate('DELETE FROM cache_login'); + $conn->executeUpdate('DELETE FROM cache_complex_action'); $conn->executeUpdate('DELETE FROM cache_token'); $conn->executeUpdate('DELETE FROM cache_action'); $conn->executeUpdate('DELETE FROM cache_client');