RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 13:31:45 +03:00
Code Issues Projects Releases Wiki Activity

#1573 - correcting test asset namespace, removing unused properties and bi-directional association

Browse Source
This commit is contained in:
Marco Pivetta 2015-12-11 20:14:53 +01:00
parent 42691c21b4
commit 66770c5bfe
4 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Doctrine/Tests/Models/VersionedOneToMany/Article.php → tests/Doctrine/Tests/Models/VersionedManyToOne/Article.php
View File

@ -1,13 +1,15 @@
<?php <?php
namespace Doctrine\Tests\Models\VersionedOneToMany; namespace Doctrine\Tests\Models\VersionedManyToOne;
/** /**
* @Entity * @Entity
* @Table(name="article") * @Table(name="versioned_many_to_one_article")
*/ */
class Article class Article
{ {
const CLASSNAME = __CLASS__;
/** /**
* @Id * @Id
* @Column(name="id", type="integer") * @Column(name="id", type="integer")

11
tests/Doctrine/Tests/Models/VersionedOneToMany/Category.php → tests/Doctrine/Tests/Models/VersionedManyToOne/Category.php
View File

@ -1,13 +1,15 @@
<?php <?php
namespace Doctrine\Tests\Models\VersionedOneToMany; namespace Doctrine\Tests\Models\VersionedManyToOne;
/** /**
* @Entity * @Entity
* @Table(name="category") * @Table(name="versioned_many_to_one_category")
*/ */
class Category class Category
{ {
const CLASSNAME = __CLASS__;
/** /**
* @Id * @Id
* @Column(name="id", type="integer") * @Column(name="id", type="integer")
@ -15,11 +17,6 @@ class Category
*/ */
public $id; public $id;
/**
* @Column(name="name")
*/
public $name;
/** /**
* Version column * Version column
* *

23
tests/Doctrine/Tests/ORM/Functional/MergeVersionedOneToManyTest.php → tests/Doctrine/Tests/ORM/Functional/MergeVersionedManyToOneTest.php
View File

@ -4,27 +4,19 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\ORM\OptimisticLockException; use Doctrine\ORM\OptimisticLockException;
use Doctrine\ORM\ORMException; use Doctrine\ORM\ORMException;
use Doctrine\Tests\Models\VersionedOneToMany\Article; use Doctrine\Tests\Models\VersionedManyToOne\Article;
use Doctrine\Tests\Models\VersionedOneToMany\Category; use Doctrine\Tests\Models\VersionedManyToOne\Category;
/** /**
* @group MergeVersionedOneToMany * @group MergeVersionedOneToMany
*/ */
class MergeVersionedOneToManyTest extends \Doctrine\Tests\OrmFunctionalTestCase class MergeVersionedManyToOneTest extends \Doctrine\Tests\OrmFunctionalTestCase
{ {
protected function setUp() protected function setUp()
{ {
parent::setUp(); $this->useModelSet('versioned_many_to_one');
try { parent::setUp();
$this->_schemaTool->createSchema(
[
$this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToMany\Category'),
$this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToMany\Article'),
]
);
} catch (ORMException $e) {
}
} }
/** /**
@ -34,10 +26,9 @@ class MergeVersionedOneToManyTest extends \Doctrine\Tests\OrmFunctionalTestCase
public function testSetVersionOnCreate() public function testSetVersionOnCreate()
{ {
$category = new Category(); $category = new Category();
$category->name = 'Category'; $article = new Article();
$article = new Article(); $article->name = 'Article';
$article->name = 'Article';
$article->category = $category; $article->category = $category;
$this->_em->persist($article); $this->_em->persist($article);

9
tests/Doctrine/Tests/OrmFunctionalTestCase.php
View File

@ -280,6 +280,10 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
'Doctrine\Tests\Models\Pagination\User', 'Doctrine\Tests\Models\Pagination\User',
'Doctrine\Tests\Models\Pagination\User1', 'Doctrine\Tests\Models\Pagination\User1',
), ),
'versioned_many_to_one' => array(
'Doctrine\Tests\Models\VersionedManyToOne\Category',
'Doctrine\Tests\Models\VersionedManyToOne\Article',
),
); );
/** /**
@ -535,6 +539,11 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
$conn->executeUpdate('DELETE FROM pagination_user'); $conn->executeUpdate('DELETE FROM pagination_user');
} }
if (isset($this->_usedModelSets['versioned_many_to_one'])) {
$conn->executeUpdate('DELETE FROM versioned_many_to_one_article');
$conn->executeUpdate('DELETE FROM versioned_many_to_one_category');
}
$this->_em->clear(); $this->_em->clear();
} }