hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor && Typo && Use plain objects as function parameters instead of ids

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-02-06 12:42:47 +01:00
parent c98fe4c23d
commit 2ec4ffdbcc
39 changed files with 909 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

220
tests/Alchemy/Tests/Phrasea/Model/Manipulator/RegistrationManipulatorTest.php
View File

@@ -2,7 +2,6 @@
namespace Alchemy\Tests\Phrasea\Registration;
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Model\Entities\Registration;
use Alchemy\Phrasea\Model\Manipulator\RegistrationManipulator;
@@ -10,51 +9,30 @@ class RegistrationManipulatorTest extends \PhraseanetTestCase
{
public function testCreateRegistration()
{
$em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
->disableOriginalConstructor()
->getMock();
$em->expects($this->once())->method('persist')->with($this->isInstanceOf('Alchemy\Phrasea\Model\Entities\Registration'));
$em->expects($this->once())->method('flush');
$service = new RegistrationManipulator($em, self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
$registration = $service->createRegistration(self::$DI['user']->get_id(), self::$DI['collection']->get_base_id());
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['EM'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox']);
$registration = $service->createRegistration(self::$DI['user'], self::$DI['collection']);
$this->assertInstanceOf('Alchemy\Phrasea\Model\Entities\Registration', $registration);
$this->assertEquals(self::$DI['collection']->get_base_id(), $registration->getBaseId());
$this->assertEquals(self::$DI['user']->get_id(), $registration->getUser());
return $registration;
$this->assertEquals(self::$DI['user']->getId(), $registration->getUser()->getId());
}
/**
* @depends testCreateRegistration
*/
public function testRejectRegistration($registration)
public function testRejectRegistration()
{
$em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
->disableOriginalConstructor()
->getMock();
$em->expects($this->once())->method('persist')->with($this->isInstanceOf('Alchemy\Phrasea\Model\Entities\Registration'));
$em->expects($this->once())->method('flush');
$service = new RegistrationManipulator($em, self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
$registration = self::$DI['registration_1'];
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['EM'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox']);
$service->rejectRegistration($registration);
$this->assertFalse($registration->isPending());
$this->assertTrue($registration->isRejected());
return $registration;
}
/**
* @depends testCreateRegistration
*/
public function testAcceptRegistration($registration)
public function testAcceptRegistration()
{
$aclMock = $this->getMockBuilder('ACL')
->disableOriginalConstructor()
->getMock();
$registration = self::$DI['registration_1'];
$aclMock = $this->getMockBuilder('ACL')->disableOriginalConstructor()->getMock();
$aclMock->expects($this->once())->method('give_access_to_sbas')->with($this->equalTo([self::$DI['collection']->get_sbas_id()]));
$aclMock->expects($this->once())->method('give_access_to_base')->with($this->equalTo([self::$DI['collection']->get_base_id()]));
$aclMock->expects($this->once())->method('update_rights_to_base')->with($this->equalTo(self::$DI['collection']->get_base_id()), $this->equalTo([
@@ -64,41 +42,35 @@ class RegistrationManipulatorTest extends \PhraseanetTestCase
'candwnldpreview' => '1',
'actif' => '1',
]));
$aclProviderMock = $this->getMockBuilder('Alchemy\Phrasea\Authentication\ACLProvider')
->disableOriginalConstructor()
->getMock();
$aclProviderMock->expects($this->any())->method('get')->with($this->equalTo(self::$DI['user']))->will($this->returnvalue($aclMock));
$em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
->disableOriginalConstructor()
->getMock();
$em->expects($this->once())->method('remove')->with($this->isInstanceOf('Alchemy\Phrasea\Model\Entities\Registration'));
$em->expects($this->once())->method('flush');
$service = new RegistrationManipulator($em, self::$DI['app']['phraseanet.appbox'], $aclProviderMock);
$service->acceptRegistration($registration, self::$DI['user'], self::$DI['collection'], true, false);
$aclProviderMock = $this->getMockBuilder('Alchemy\Phrasea\Authentication\ACLProvider')->disableOriginalConstructor()->getMock();
$aclProviderMock->expects($this->any())->method('get')->with($this->isInstanceOf('Alchemy\Phrasea\Model\Entities\User'))->will($this->returnvalue($aclMock));
self::$DI['app']['acl'] = $aclProviderMock;
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['EM'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox']);
$service->acceptRegistration($registration, true, false);
}
public function testDeleteRegistrationForUser()
{
$service = new RegistrationManipulator(self::$DI['app']['EM'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['EM'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox']);
$qb = $service->getRepository()->createQueryBuilder('r');
$nbRegistrationBefore = $qb->select('COUNT(r)')
->where($qb->expr()->eq('r.user', ':user'))
->setParameter(':user', self::$DI['user_alt1']->get_id())
->setParameter(':user', self::$DI['user_alt1']->getId())
->getQuery()
->getSingleScalarResult();
$service->deleteRegistrationsForUser(self::$DI['user_alt1']->get_id(), [self::$DI['collection']->get_base_id()]);
$service->deleteUserRegistrations(self::$DI['user_alt1'], [self::$DI['collection']]);
$nbRegistrationAfter = $qb->getQuery()->getSingleScalarResult();
$this->assertGreaterThan($nbRegistrationAfter, $nbRegistrationBefore);
}
public function testDeleteOldRegistrations()
{
$service = new RegistrationManipulator(self::$DI['app']['EM'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['EM'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox']);
$qb = $service->getRepository()->createQueryBuilder('r');
$nbRegistrationBefore = $qb->select('COUNT(r)')
->getQuery()
->getSingleScalarResult();
$nbRegistrationBefore = $qb->select('COUNT(r)')->getQuery()->getSingleScalarResult();
$service->deleteOldRegistrations();
$nbRegistrationAfter = $qb->getQuery()->getSingleScalarResult();
$this->assertGreaterThan($nbRegistrationAfter, $nbRegistrationBefore);
@@ -106,151 +78,11 @@ class RegistrationManipulatorTest extends \PhraseanetTestCase
public function testDeleteRegistrationOnCollection()
{
$service = new RegistrationManipulator(self::$DI['app']['EM'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['EM'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox']);
$qb = $service->getRepository()->createQueryBuilder('r');
$nbRegistrationBefore = $qb->select('COUNT(r)')
->getQuery()
->getSingleScalarResult();
$service->deleteRegistrationsOnCollection(self::$DI['collection']->get_base_id());
$nbRegistrationBefore = $qb->select('COUNT(r)')->getQuery()->getSingleScalarResult();
$service->deleteRegistrationsOnCollection(self::$DI['collection']);
$nbRegistrationAfter = $qb->getQuery()->getSingleScalarResult();
$this->assertGreaterThan($nbRegistrationAfter, $nbRegistrationBefore);
}
/**
* @dataProvider userDataProvider
*/
public function testGetRegistrationSummaryWithUserData($data, $type, $value)
{
$repoMock = $this->getMockBuilder('Alchemy\Phrasea\Model\Repositories\RegistrationRepository')
->disableOriginalConstructor()
->setMethods(['getRegistrationsSummaryForUser'])
->getMock();
$repoMock->expects($this->once())->method('getRegistrationsSummaryForUser')->will($this->returnValue($data));
$em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
->disableOriginalConstructor()
->getMock();
$em->expects($this->once())->method('getRepository')->will($this->returnValue($repoMock));
$service = new RegistrationManipulator($em, self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
$rs = $service->getRegistrationSummary(4);
$databox = current(self::$DI['app']['phraseanet.appbox']->get_databoxes());
$collection = current($databox->get_collections());
$this->assertEquals($value, count($rs[$databox->get_sbas_id()]['registrations']['by-type'][$type]));
$this->assertNotNull($rs[$databox->get_sbas_id()]['registrations']['by-collection'][$collection->get_base_id()]);
}
public function userDataProvider()
{
$pendingRegistration = new Registration();
$pendingRegistration->setBaseId(1);
$pendingRegistration->setUser(3);
$pendingRegistration->setPending(true);
$pendingRegistration->setRejected(false);
$rejectedRegistration = new Registration();
$rejectedRegistration->setBaseId(1);
$rejectedRegistration->setUser(3);
$rejectedRegistration->setPending(true);
$rejectedRegistration->setRejected(true);
$databox = current((new \appbox(new Application()))->get_databoxes());
$collection = current($databox->get_collections());
$noLimitedPendingRegistration = [
[
$databox->get_sbas_id() => [
$collection->get_base_id() => [
'base-id' => $collection->get_base_id(),
'db-name' => 'toto',
'active' => true,
'time-limited' => false,
'in-time' => null,
'registration' => $pendingRegistration
]
]
],
'pending',
1
];
$rejectedRegistration = [
[
$databox->get_sbas_id() => [
$collection->get_base_id() => [
'base-id' => $collection->get_base_id(),
'db-name' => 'titi',
'active' => true,
'time-limited' => false,
'in-time' => null,
'registration' => $rejectedRegistration
]
]
],
'rejected',
1
];
$noActiveRegistration = [
[
$databox->get_sbas_id() => [
$collection->get_base_id() => [
'base-id' => 1,
'db-name' => 'tutu',
'active' => false,
'time-limited' => false,
'in-time' => null,
'registration' => $pendingRegistration
]
]
],
'inactive',
1
];
$limitedActiveIntimePendingRegistration = [
[
$databox->get_sbas_id() => [
$collection->get_base_id() => [
'base-id' => $collection->get_base_id(),
'db-name' => 'tata',
'active' => true,
'time-limited' => true,
'in-time' => true,
'registration' => $pendingRegistration
]
]
],
'in-time',
1
];
$limitedActiveOutdatedPendingRegistration = [
[
$databox->get_sbas_id() => [
$collection->get_base_id() => [
'base-id' => $collection->get_base_id(),
'db-name' => 'toutou',
'active' => true,
'time-limited' => true,
'in-time' => false,
'registration' => $pendingRegistration
]
]
],
'out-time',
1
];
return [
$noLimitedPendingRegistration,
$noActiveRegistration,
$limitedActiveIntimePendingRegistration,
$limitedActiveOutdatedPendingRegistration,
$rejectedRegistration
];
}
}

6
tests/Alchemy/Tests/Phrasea/Model/Repositories/FeedItemRepositoryTest.php
View File

@@ -53,14 +53,14 @@ class FeedItemRepositoryTest extends \PhraseanetTestCase
$item = new FeedItem();
$item->setEntry($entry)
->setOrd(4)
->setRecordId(self::$DI['record_1']->get_record_id())
->setSbasId(self::$DI['record_1']->get_record_id());
->setRecordId(123456789)
->setSbasId(123456789);
$entry->addItem($item);
self::$DI['app']['EM']->persist($item);
self::$DI['app']['EM']->persist($entry);
self::$DI['app']['EM']->flush();
$this->assertCount(4, self::$DI['app']['EM']->getRepository('Phraseanet:FeedItem')->loadLatest(self::$DI['app'], 20));
$this->assertCount(3, self::$DI['app']['EM']->getRepository('Phraseanet:FeedItem')->loadLatest(self::$DI['app'], 20));
}
}