RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-07 17:47:10 +03:00
Code Issues Projects Releases Wiki Activity

Cleaned up tests for DDC-2775

Browse Source
This commit is contained in:
Matthieu Napoli 2013-12-14 19:57:53 +01:00
parent 1899bcf000
commit 602c3be3fc
4 changed files with 12 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/Doctrine/Tests/Models/DDC2775/Authorization.php
View File

@ -11,30 +11,15 @@ class Authorization
* @Id @Column(type="integer") * @Id @Column(type="integer")
* @GeneratedValue * @GeneratedValue
*/ */
private $id; public $id;
/** /**
* @ManyToOne(targetEntity="User", inversedBy="authorizations") * @ManyToOne(targetEntity="User", inversedBy="authorizations")
*/ */
private $user; public $user;
/** /**
* @ManyToOne(targetEntity="Role", inversedBy="authorizations") * @ManyToOne(targetEntity="Role", inversedBy="authorizations")
*/ */
private $role; public $role;
public function getId()
{
return $this->id;
}
public function setUser(User $user)
{
$this->user = $user;
}
public function setRole(Role $role)
{
$this->role = $role;
}
} }

21
tests/Doctrine/Tests/Models/DDC2775/Role.php
View File

@ -14,36 +14,21 @@ abstract class Role
* @Id @Column(type="integer") * @Id @Column(type="integer")
* @GeneratedValue * @GeneratedValue
*/ */
private $id; public $id;
/** /**
* @ManyToOne(targetEntity="User", inversedBy="roles") * @ManyToOne(targetEntity="User", inversedBy="roles")
*/ */
private $user; public $user;
/** /**
* @OneToMany(targetEntity="Authorization", mappedBy="role", cascade={"all"}, orphanRemoval=true) * @OneToMany(targetEntity="Authorization", mappedBy="role", cascade={"all"}, orphanRemoval=true)
*/ */
public $authorizations; public $authorizations;
public function getId()
{
return $this->id;
}
public function getUser()
{
return $this->user;
}
public function setUser(User $user)
{
$this->user = $user;
}
public function addAuthorization(Authorization $authorization) public function addAuthorization(Authorization $authorization)
{ {
$this->authorizations[] = $authorization; $this->authorizations[] = $authorization;
$authorization->setRole($this); $authorization->role = $this;
} }
} }

11
tests/Doctrine/Tests/Models/DDC2775/User.php
View File

@ -11,7 +11,7 @@ class User
* @Id @Column(type="integer") * @Id @Column(type="integer")
* @GeneratedValue(strategy="AUTO") * @GeneratedValue(strategy="AUTO")
*/ */
private $id; public $id;
/** /**
* @OneToMany(targetEntity="Role", mappedBy="user", cascade={"all"}, orphanRemoval=true) * @OneToMany(targetEntity="Role", mappedBy="user", cascade={"all"}, orphanRemoval=true)
@ -23,20 +23,15 @@ class User
*/ */
public $authorizations; public $authorizations;
public function getId()
{
return $this->id;
}
public function addRole(Role $role) public function addRole(Role $role)
{ {
$this->roles[] = $role; $this->roles[] = $role;
$role->setUser($this); $role->user = $this;
} }
public function addAuthorization(Authorization $authorization) public function addAuthorization(Authorization $authorization)
{ {
$this->authorizations[] = $authorization; $this->authorizations[] = $authorization;
$authorization->setUser($this); $authorization->user = $this;
} }
} }

5
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php
View File

@ -5,13 +5,14 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Tests\Models\DDC2775\AdminRole; use Doctrine\Tests\Models\DDC2775\AdminRole;
use Doctrine\Tests\Models\DDC2775\Authorization; use Doctrine\Tests\Models\DDC2775\Authorization;
use Doctrine\Tests\Models\DDC2775\User; use Doctrine\Tests\Models\DDC2775\User;
use Doctrine\Tests\OrmFunctionalTestCase;
/** /**
* Functional tests for cascade remove with class table inheritance. * Functional tests for cascade remove with class table inheritance.
* *
* @author Matthieu Napoli <matthieu@mnapoli.fr> * @author Matthieu Napoli <matthieu@mnapoli.fr>
*/ */
class DDC2775Test extends \Doctrine\Tests\OrmFunctionalTestCase class DDC2775Test extends OrmFunctionalTestCase
{ {
protected function setUp() { protected function setUp() {
$this->useModelSet('ddc2775'); $this->useModelSet('ddc2775');
@ -38,7 +39,7 @@ class DDC2775Test extends \Doctrine\Tests\OrmFunctionalTestCase
// Need to clear so that associations are lazy-loaded // Need to clear so that associations are lazy-loaded
$this->_em->clear(); $this->_em->clear();
$user = $this->_em->find('Doctrine\Tests\Models\DDC2775\User', $user->getId()); $user = $this->_em->find('Doctrine\Tests\Models\DDC2775\User', $user->id);
$this->_em->remove($user); $this->_em->remove($user);
$this->_em->flush(); $this->_em->flush();