RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Adjusted test to verify that findBy*(null) is now supported

Browse source
This commit is contained in:
Alexander 2011-10-17 18:54:20 +02:00
parent fea855004c
commit 91bc9c0329
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/Doctrine/Tests/Models/CMS/CmsUser.php
View file

@ -19,7 +19,7 @@ class CmsUser
*/ */
public $id; public $id;
/** /**
* @Column(type="string", length=50) * @Column(type="string", length=50, nullable=true)
*/ */
public $status; public $status;
/** /**

32
tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php
View file

@ -38,18 +38,25 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$user2->status = 'dev'; $user2->status = 'dev';
$this->_em->persist($user2); $this->_em->persist($user2);
$user3 = new CmsUser;
$user3->name = 'Benjamin';
$user3->username = 'beberlei';
$user3->status = null;
$this->_em->persist($user3);
$this->_em->flush(); $this->_em->flush();
$user1Id = $user->getId(); $user1Id = $user->getId();
unset($user); unset($user);
unset($user2); unset($user2);
unset($user3);
$this->_em->clear(); $this->_em->clear();
return $user1Id; return $user1Id;
} }
public function loadAssociatedFixture() public function loadAssociatedFixture()
{ {
$address = new CmsAddress(); $address = new CmsAddress();
@ -189,7 +196,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
$users = $repos->findAll(); $users = $repos->findAll();
$this->assertEquals(2, count($users)); $this->assertEquals(3, count($users));
} }
public function testFindByAlias() public function testFindByAlias()
@ -202,7 +209,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$repos = $this->_em->getRepository('CMS:CmsUser'); $repos = $this->_em->getRepository('CMS:CmsUser');
$users = $repos->findAll(); $users = $repos->findAll();
$this->assertEquals(2, count($users)); $this->assertEquals(3, count($users));
} }
/** /**
@ -284,10 +291,11 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
public function testFindMagicCallByNullValue() public function testFindMagicCallByNullValue()
{ {
$this->loadFixture(); $this->loadFixture();
$repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
$this->setExpectedException('Doctrine\ORM\ORMException');
$users = $repos->findByStatus(null); $users = $repos->findByStatus(null);
$this->assertEquals(1, count($users));
} }
/** /**
@ -411,7 +419,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$users1 = $repos->findBy(array(), null, 1, 0); $users1 = $repos->findBy(array(), null, 1, 0);
$users2 = $repos->findBy(array(), null, 1, 1); $users2 = $repos->findBy(array(), null, 1, 1);
$this->assertEquals(2, count($repos->findBy(array()))); $this->assertEquals(3, count($repos->findBy(array())));
$this->assertEquals(1, count($users1)); $this->assertEquals(1, count($users1));
$this->assertEquals(1, count($users2)); $this->assertEquals(1, count($users2));
$this->assertNotSame($users1[0], $users2[0]); $this->assertNotSame($users1[0], $users2[0]);
@ -428,10 +436,10 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$usersAsc = $repos->findBy(array(), array("username" => "ASC")); $usersAsc = $repos->findBy(array(), array("username" => "ASC"));
$usersDesc = $repos->findBy(array(), array("username" => "DESC")); $usersDesc = $repos->findBy(array(), array("username" => "DESC"));
$this->assertEquals(2, count($usersAsc), "Pre-condition: only two users in fixture"); $this->assertEquals(3, count($usersAsc), "Pre-condition: only three users in fixture");
$this->assertEquals(2, count($usersDesc), "Pre-condition: only two users in fixture"); $this->assertEquals(3, count($usersDesc), "Pre-condition: only three users in fixture");
$this->assertSame($usersAsc[0], $usersDesc[1]); $this->assertSame($usersAsc[0], $usersDesc[2]);
$this->assertSame($usersAsc[1], $usersDesc[0]); $this->assertSame($usersAsc[2], $usersDesc[0]);
} }