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

Multiple ORMs for all database

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-10-16 20:00:27 +02:00
parent 007d83fe57
commit 9a3e92ed9c
252 changed files with 2901 additions and 2417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Alchemy/Tests/Phrasea/Model/Converter/BasketConverterTest.php
View File

@@ -8,9 +8,9 @@ class BasketConverterTest extends \PhraseanetTestCase
{
public function testConvert()
{
$basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
$basket = self::$DI['app']['orm.em']->find('Phraseanet:Basket', 1);
$converter = new BasketConverter(self::$DI['app']['EM']->getRepository('Phraseanet:Basket'));
$converter = new BasketConverter(self::$DI['app']['orm.em']->getRepository('Phraseanet:Basket'));
$this->assertSame($basket, $converter->convert($basket->getId()));
}
@@ -20,7 +20,7 @@ class BasketConverterTest extends \PhraseanetTestCase
*/
public function testConvertFailure()
{
$converter = new BasketConverter(self::$DI['app']['EM']->getRepository('Phraseanet:Basket'));
$converter = new BasketConverter(self::$DI['app']['orm.em']->getRepository('Phraseanet:Basket'));
$converter->convert('prout');
}
}

6
tests/Alchemy/Tests/Phrasea/Model/Converter/TaskConverterTest.php
View File

@@ -8,9 +8,9 @@ class TaskConverterTest extends \PhraseanetTestCase
{
public function testConvert()
{
$task = self::$DI['app']['EM']->find('Phraseanet:Task', 1);
$task = self::$DI['app']['orm.em']->find('Phraseanet:Task', 1);
$converter = new TaskConverter(self::$DI['app']['EM']->getRepository('Phraseanet:Task'));
$converter = new TaskConverter(self::$DI['app']['orm.em']->getRepository('Phraseanet:Task'));
$this->assertSame($task, $converter->convert(1));
}
@@ -20,7 +20,7 @@ class TaskConverterTest extends \PhraseanetTestCase
*/
public function testConvertFailure()
{
$converter = new TaskConverter(self::$DI['app']['EM']->getRepository('Phraseanet:Task'));
$converter = new TaskConverter(self::$DI['app']['orm.em']->getRepository('Phraseanet:Task'));
$converter->convert('prout');
}
}

10
tests/Alchemy/Tests/Phrasea/Model/Manipulator/ApiAccountManipulatorTest.php
View File

@@ -9,7 +9,7 @@ class ApiAccountManipulatorTest extends \PhraseanetTestCase
{
public function testCreate()
{
$manipulator = new ApiAccountManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-accounts']);
$manipulator = new ApiAccountManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-accounts']);
$nbApps = count(self::$DI['app']['repo.api-accounts']->findAll());
$account = $manipulator->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$this->assertGreaterThan($nbApps, count(self::$DI['app']['repo.api-accounts']->findAll()));
@@ -20,7 +20,7 @@ class ApiAccountManipulatorTest extends \PhraseanetTestCase
public function testDelete()
{
$manipulator = new ApiAccountManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-accounts']);
$manipulator = new ApiAccountManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-accounts']);
$account = $manipulator->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$accountMem = clone $account;
$countBefore = count(self::$DI['app']['repo.api-accounts']->findAll());
@@ -33,7 +33,7 @@ class ApiAccountManipulatorTest extends \PhraseanetTestCase
public function testUpdate()
{
$manipulator = new ApiAccountManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-accounts']);
$manipulator = new ApiAccountManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-accounts']);
$account = $manipulator->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$account->setApiVersion(24);
$manipulator->update($account);
@@ -43,7 +43,7 @@ class ApiAccountManipulatorTest extends \PhraseanetTestCase
public function testAuthorizeAccess()
{
$manipulator = new ApiAccountManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-accounts']);
$manipulator = new ApiAccountManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-accounts']);
$account = $manipulator->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$manipulator->authorizeAccess($account);
$this->assertFalse($account->isRevoked());
@@ -51,7 +51,7 @@ class ApiAccountManipulatorTest extends \PhraseanetTestCase
public function testRevokeAccess()
{
$manipulator = new ApiAccountManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-accounts']);
$manipulator = new ApiAccountManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-accounts']);
$account = $manipulator->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$manipulator->revokeAccess($account);
$this->assertTrue($account->isRevoked());

14
tests/Alchemy/Tests/Phrasea/Model/Manipulator/ApiApplicationManipulatorTest.php
View File

@@ -10,7 +10,7 @@ class ApiApplicationManipulatorTest extends \PhraseanetTestCase
{
public function testCreateDesktopApplication()
{
$manipulator = new ApiApplicationManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$manipulator = new ApiApplicationManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$nbApps = count(self::$DI['app']['repo.api-applications']->findAll());
$application = $manipulator->create(
'desktop-app',
@@ -30,7 +30,7 @@ class ApiApplicationManipulatorTest extends \PhraseanetTestCase
public function testCreateWebApplication()
{
$manipulator = new ApiApplicationManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$manipulator = new ApiApplicationManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$nbApps = count(self::$DI['app']['repo.api-applications']->findAll());
$application = $manipulator->create(
'web-app',
@@ -53,7 +53,7 @@ class ApiApplicationManipulatorTest extends \PhraseanetTestCase
public function testDelete()
{
$manipulator = new ApiApplicationManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$manipulator = new ApiApplicationManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$application = $manipulator->create(
'desktop-app2',
ApiApplication::DESKTOP_TYPE,
@@ -75,7 +75,7 @@ class ApiApplicationManipulatorTest extends \PhraseanetTestCase
public function testUpdate()
{
$manipulator = new ApiApplicationManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$manipulator = new ApiApplicationManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$application = $manipulator->create(
'desktop-app3',
ApiApplication::DESKTOP_TYPE,
@@ -90,7 +90,7 @@ class ApiApplicationManipulatorTest extends \PhraseanetTestCase
public function testSetType()
{
$manipulator = new ApiApplicationManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$manipulator = new ApiApplicationManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$application = $manipulator->create(
'desktop-app4',
ApiApplication::DESKTOP_TYPE,
@@ -107,7 +107,7 @@ class ApiApplicationManipulatorTest extends \PhraseanetTestCase
public function testSetRedirectUri()
{
$manipulator = new ApiApplicationManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$manipulator = new ApiApplicationManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$application = $manipulator->create(
'desktop-app5',
ApiApplication::DESKTOP_TYPE,
@@ -136,7 +136,7 @@ class ApiApplicationManipulatorTest extends \PhraseanetTestCase
public function testSetWebsiteUrl()
{
$manipulator = new ApiApplicationManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$manipulator = new ApiApplicationManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$application = $manipulator->create(
'desktop-app6',
ApiApplication::DESKTOP_TYPE,

12
tests/Alchemy/Tests/Phrasea/Model/Manipulator/ApiLogManipulatorTest.php
View File

@@ -11,10 +11,10 @@ class ApiLogManipulatorTest extends \PhraseanetTestCase
{
public function testCreate()
{
$manipulator = new ApiAccountManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-accounts']);
$manipulator = new ApiAccountManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-accounts']);
$account = $manipulator->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$nbLogs = count(self::$DI['app']['repo.api-logs']->findAll());
$manipulator = new ApiLogManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-logs']);
$manipulator = new ApiLogManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-logs']);
$manipulator->create($account, Request::create('/databoxes/list/', 'POST'), new Response());
$this->assertGreaterThan($nbLogs, count(self::$DI['app']['repo.api-accounts']->findAll()));
}
@@ -36,9 +36,9 @@ class ApiLogManipulatorTest extends \PhraseanetTestCase
public function testDelete()
{
$manipulator = new ApiAccountManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-accounts']);
$manipulator = new ApiAccountManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-accounts']);
$account = $manipulator->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$manipulator = new ApiLogManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-logs']);
$manipulator = new ApiLogManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-logs']);
$log = $manipulator->create($account, Request::create('/databoxes/list/', 'POST'), new Response());
$countBefore = count(self::$DI['app']['repo.api-logs']->findAll());
$manipulator->delete($log);
@@ -47,9 +47,9 @@ class ApiLogManipulatorTest extends \PhraseanetTestCase
public function testUpdate()
{
$manipulator = new ApiAccountManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-accounts']);
$manipulator = new ApiAccountManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-accounts']);
$account = $manipulator->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$manipulator = new ApiLogManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-logs']);
$manipulator = new ApiLogManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-logs']);
$log = $manipulator->create($account, Request::create('/databoxes/list/', 'POST'), new Response());
$log->setAspect('a-new-aspect');
$manipulator->update($log);

8
tests/Alchemy/Tests/Phrasea/Model/Manipulator/ApiOauthCodeManipulatorTest.php
View File

@@ -9,7 +9,7 @@ class ApiOauthCodeManipulatorTest extends \PhraseanetTestCase
{
public function testCreate()
{
$manipulator = new ApiOauthCodeManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-oauth-codes'], self::$DI['app']['random.medium']);
$manipulator = new ApiOauthCodeManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-oauth-codes'], self::$DI['app']['random.medium']);
$nbCodes = count(self::$DI['app']['repo.api-oauth-codes']->findAll());
$account = self::$DI['app']['manipulator.api-account']->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$manipulator->create($account, 'http://www.redirect.url', time() + 30);
@@ -18,7 +18,7 @@ class ApiOauthCodeManipulatorTest extends \PhraseanetTestCase
public function testDelete()
{
$manipulator = new ApiOauthCodeManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-oauth-codes'], self::$DI['app']['random.medium']);
$manipulator = new ApiOauthCodeManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-oauth-codes'], self::$DI['app']['random.medium']);
$account = self::$DI['app']['manipulator.api-account']->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$code = $manipulator->create($account, 'http://www.redirect.url', time() + 30);
$countBefore = count(self::$DI['app']['repo.api-oauth-codes']->findAll());
@@ -29,7 +29,7 @@ class ApiOauthCodeManipulatorTest extends \PhraseanetTestCase
public function testUpdate()
{
$manipulator = new ApiOauthCodeManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-oauth-codes'], self::$DI['app']['random.medium']);
$manipulator = new ApiOauthCodeManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-oauth-codes'], self::$DI['app']['random.medium']);
$account = self::$DI['app']['manipulator.api-account']->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$code = $manipulator->create($account, 'http://www.redirect.url', $t = time() + 30);
$code->setExpires(time() + 40);
@@ -43,7 +43,7 @@ class ApiOauthCodeManipulatorTest extends \PhraseanetTestCase
*/
public function testSetRedirectUriBadArgumentException()
{
$manipulator = new ApiOauthCodeManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-oauth-codes'], self::$DI['app']['random.medium']);
$manipulator = new ApiOauthCodeManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-oauth-codes'], self::$DI['app']['random.medium']);
$account = self::$DI['app']['manipulator.api-account']->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$code = $manipulator->create($account, 'http://www.redirect.url', time() + 30);
try {

8
tests/Alchemy/Tests/Phrasea/Model/Manipulator/ApiOauthTokenManipulatorTest.php
View File

@@ -8,7 +8,7 @@ class ApiOauthTokenManipulatorTest extends \PhraseanetTestCase
{
public function testCreate()
{
$manipulator = new ApiOauthTokenManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-oauth-tokens'], self::$DI['app']['random.medium']);
$manipulator = new ApiOauthTokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-oauth-tokens'], self::$DI['app']['random.medium']);
$nbTokens = count(self::$DI['app']['repo.api-oauth-tokens']->findAll());
$account = self::$DI['app']['manipulator.api-account']->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$manipulator->create($account);
@@ -17,7 +17,7 @@ class ApiOauthTokenManipulatorTest extends \PhraseanetTestCase
public function testDelete()
{
$manipulator = new ApiOauthTokenManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-oauth-tokens'], self::$DI['app']['random.medium']);
$manipulator = new ApiOauthTokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-oauth-tokens'], self::$DI['app']['random.medium']);
$account = self::$DI['app']['manipulator.api-account']->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$token = $manipulator->create($account);
$countBefore = count(self::$DI['app']['repo.api-oauth-tokens']->findAll());
@@ -28,7 +28,7 @@ class ApiOauthTokenManipulatorTest extends \PhraseanetTestCase
public function testUpdate()
{
$manipulator = new ApiOauthTokenManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-oauth-tokens'], self::$DI['app']['random.medium']);
$manipulator = new ApiOauthTokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-oauth-tokens'], self::$DI['app']['random.medium']);
$account = self::$DI['app']['manipulator.api-account']->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$token = $manipulator->create($account);
$token->setSessionId(123456);
@@ -39,7 +39,7 @@ class ApiOauthTokenManipulatorTest extends \PhraseanetTestCase
public function testRenew()
{
$manipulator = new ApiOauthTokenManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-oauth-tokens'], self::$DI['app']['random.medium']);
$manipulator = new ApiOauthTokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-oauth-tokens'], self::$DI['app']['random.medium']);
$account = self::$DI['app']['manipulator.api-account']->create(self::$DI['oauth2-app-user'], self::$DI['user']);
$token = $manipulator->create($account);
$oauthTokenBefore = $token->getOauthToken();

4
tests/Alchemy/Tests/Phrasea/Model/Manipulator/PresetManipulatorTest.php
View File

@@ -8,7 +8,7 @@ class PresetManipulatorTest extends \PhraseanetTestCase
{
public function testCreate()
{
$manipulator = new PresetManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.presets']);
$manipulator = new PresetManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.presets']);
$this->assertCount(0, self::$DI['app']['repo.presets']->findAll());
$fields = [
['name' => 'titi', 'value' => 'titi_value'], ['name' => 'tutu', 'value' => 'tutu_value'],
@@ -25,7 +25,7 @@ class PresetManipulatorTest extends \PhraseanetTestCase
public function testDelete()
{
$manipulator = new PresetManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.presets']);
$manipulator = new PresetManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.presets']);
$preset = $manipulator->create(self::$DI['user'], self::$DI['collection']->get_sbas_id(), 'title', []);
$countBefore = count(self::$DI['app']['repo.presets']->findAll());
$manipulator->delete($preset);

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

@@ -9,7 +9,7 @@ class RegistrationManipulatorTest extends \PhraseanetTestCase
{
public function testCreateRegistration()
{
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['EM'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['repo.registrations']);
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['orm.em'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['repo.registrations']);
$registration = $service->createRegistration(self::$DI['user'], self::$DI['collection']);
$this->assertInstanceOf('Alchemy\Phrasea\Model\Entities\Registration', $registration);
@@ -21,7 +21,7 @@ class RegistrationManipulatorTest extends \PhraseanetTestCase
{
$registration = self::$DI['registration_1'];
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['EM'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['repo.registrations']);
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['orm.em'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['repo.registrations']);
$service->rejectRegistration($registration);
$this->assertFalse($registration->isPending());
@@ -48,13 +48,13 @@ class RegistrationManipulatorTest extends \PhraseanetTestCase
self::$DI['app']['acl'] = $aclProviderMock;
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['EM'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['repo.registrations']);
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['orm.em'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['repo.registrations']);
$service->acceptRegistration($registration, true, false);
}
public function testDeleteRegistrationForUser()
{
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['EM'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['repo.registrations']);
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['orm.em'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['repo.registrations']);
$qb = self::$DI['app']['repo.registrations']->createQueryBuilder('r');
$nbRegistrationBefore = $qb->select('COUNT(r)')
->where($qb->expr()->eq('r.user', ':user'))
@@ -68,7 +68,7 @@ class RegistrationManipulatorTest extends \PhraseanetTestCase
public function testDeleteOldRegistrations()
{
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['EM'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['repo.registrations']);
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['orm.em'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['repo.registrations']);
$qb = self::$DI['app']['repo.registrations']->createQueryBuilder('r');
$nbRegistrationBefore = $qb->select('COUNT(r)')->getQuery()->getSingleScalarResult();
$service->deleteOldRegistrations();
@@ -78,7 +78,7 @@ class RegistrationManipulatorTest extends \PhraseanetTestCase
public function testDeleteRegistrationOnCollection()
{
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['EM'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['repo.registrations']);
$service = new RegistrationManipulator(self::$DI['app'], self::$DI['app']['orm.em'], self::$DI['app']['acl'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['repo.registrations']);
$qb = self::$DI['app']['repo.registrations']->createQueryBuilder('r');
$nbRegistrationBefore = $qb->select('COUNT(r)')->getQuery()->getSingleScalarResult();
$service->deleteRegistrationsOnCollection(self::$DI['collection']);

32
tests/Alchemy/Tests/Phrasea/Model/Manipulator/TaskManipulatorTest.php
View File

@@ -15,7 +15,7 @@ class TaskManipulatorTest extends \PhraseanetTestCase
->method('notify')
->with(Notifier::MESSAGE_CREATE);
$manipulator = new TaskManipulator(self::$DI['app']['EM'], $notifier, self::$DI['app']['translator'], self::$DI['app']['repo.tasks']);
$manipulator = new TaskManipulator(self::$DI['app']['orm.em'], $notifier, self::$DI['app']['translator'], self::$DI['app']['repo.tasks']);
$this->assertCount(2, $this->findAllTasks());
$task = $manipulator->create('prout', 'bla bla', 'super settings', 0);
$this->assertEquals('prout', $task->getName());
@@ -36,12 +36,12 @@ class TaskManipulatorTest extends \PhraseanetTestCase
->method('notify')
->with(Notifier::MESSAGE_UPDATE);
$manipulator = new TaskManipulator(self::$DI['app']['EM'], $notifier, self::$DI['app']['translator'], self::$DI['app']['repo.tasks']);
$manipulator = new TaskManipulator(self::$DI['app']['orm.em'], $notifier, self::$DI['app']['translator'], self::$DI['app']['repo.tasks']);
$task = $this->loadTask();
$task->setName('new name');
$this->assertSame($task, $manipulator->update($task));
self::$DI['app']['EM']->clear();
$updated = self::$DI['app']['EM']->find('Phraseanet:Task', 1);
self::$DI['app']['orm.em']->clear();
$updated = self::$DI['app']['orm.em']->find('Phraseanet:Task', 1);
$this->assertEquals($task, $updated);
}
@@ -52,7 +52,7 @@ class TaskManipulatorTest extends \PhraseanetTestCase
->method('notify')
->with(Notifier::MESSAGE_DELETE);
$manipulator = new TaskManipulator(self::$DI['app']['EM'], $notifier, self::$DI['app']['translator'], self::$DI['app']['repo.tasks']);
$manipulator = new TaskManipulator(self::$DI['app']['orm.em'], $notifier, self::$DI['app']['translator'], self::$DI['app']['repo.tasks']);
$task = $this->loadTask();
$manipulator->delete($task);
$this->assertNotContains($task, $this->findAllTasks());
@@ -65,11 +65,11 @@ class TaskManipulatorTest extends \PhraseanetTestCase
->method('notify')
->with(Notifier::MESSAGE_UPDATE);
$manipulator = new TaskManipulator(self::$DI['app']['EM'], $notifier, self::$DI['app']['translator'], self::$DI['app']['repo.tasks']);
$manipulator = new TaskManipulator(self::$DI['app']['orm.em'], $notifier, self::$DI['app']['translator'], self::$DI['app']['repo.tasks']);
$task = $this->loadTask();
$task->setStatus(Task::STATUS_STOPPED);
self::$DI['app']['EM']->persist($task);
self::$DI['app']['EM']->flush();
self::$DI['app']['orm.em']->persist($task);
self::$DI['app']['orm.em']->flush();
$manipulator->start($task);
$this->assertEquals(Task::STATUS_STARTED, $task->getStatus());
}
@@ -81,11 +81,11 @@ class TaskManipulatorTest extends \PhraseanetTestCase
->method('notify')
->with(Notifier::MESSAGE_UPDATE);
$manipulator = new TaskManipulator(self::$DI['app']['EM'], $notifier, self::$DI['app']['translator'], self::$DI['app']['repo.tasks']);
$manipulator = new TaskManipulator(self::$DI['app']['orm.em'], $notifier, self::$DI['app']['translator'], self::$DI['app']['repo.tasks']);
$task = $this->loadTask();
$task->setStatus(Task::STATUS_STARTED);
self::$DI['app']['EM']->persist($task);
self::$DI['app']['EM']->flush();
self::$DI['app']['orm.em']->persist($task);
self::$DI['app']['orm.em']->flush();
$manipulator->stop($task);
$this->assertEquals(Task::STATUS_STOPPED, $task->getStatus());
}
@@ -97,7 +97,7 @@ class TaskManipulatorTest extends \PhraseanetTestCase
->method('notify')
->with(Notifier::MESSAGE_UPDATE);
$manipulator = new TaskManipulator(self::$DI['app']['EM'], $notifier, self::$DI['app']['translator'], self::$DI['app']['repo.tasks']);
$manipulator = new TaskManipulator(self::$DI['app']['orm.em'], $notifier, self::$DI['app']['translator'], self::$DI['app']['repo.tasks']);
$task = $this->loadTask();
$task->setCrashed(42);
$manipulator->resetCrashes($task);
@@ -113,10 +113,10 @@ class TaskManipulatorTest extends \PhraseanetTestCase
->method('get_base_id')
->will($this->returnValue(42));
$manipulator = new TaskManipulator(self::$DI['app']['EM'], $this->createNotifierMock(), self::$DI['app']['translator'], self::$DI['app']['repo.tasks']);
$manipulator = new TaskManipulator(self::$DI['app']['orm.em'], $this->createNotifierMock(), self::$DI['app']['translator'], self::$DI['app']['repo.tasks']);
$task = $manipulator->createEmptyCollectionJob($collection);
$tasks = self::$DI['app']['EM']->getRepository('Phraseanet:Task')->findAll();
$tasks = self::$DI['app']['orm.em']->getRepository('Phraseanet:Task')->findAll();
$this->assertSame('EmptyCollection', $task->getJobId());
$this->assertContains($task, $tasks);
$settings = simplexml_load_string($task->getSettings());
@@ -124,12 +124,12 @@ class TaskManipulatorTest extends \PhraseanetTestCase
}
private function findAllTasks()
{
return self::$DI['app']['EM']->getRepository('Phraseanet:Task')->findAll();
return self::$DI['app']['orm.em']->getRepository('Phraseanet:Task')->findAll();
}
private function loadTask()
{
return self::$DI['app']['EM']->find('Phraseanet:Task', 1);
return self::$DI['app']['orm.em']->find('Phraseanet:Task', 1);
}
private function createNotifierMock()

24
tests/Alchemy/Tests/Phrasea/Model/Manipulator/TokenManipulatorTest.php
View File

@@ -14,7 +14,7 @@ class TokenManipulatorTest extends \PhraseanetTestCase
{
$user = $user ? self::$DI['user'] : null;
$manipulator = new TokenManipulator(self::$DI['app']['EM'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$manipulator = new TokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$token = $manipulator->create($user, $type, $expiration, $data);
$this->assertSame($user, $token->getUser());
@@ -37,7 +37,7 @@ class TokenManipulatorTest extends \PhraseanetTestCase
public function testCreateBasketValidationToken()
{
$manipulator = new TokenManipulator(self::$DI['app']['EM'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$manipulator = new TokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$token = $manipulator->createBasketValidationToken(self::$DI['basket_4'], self::$DI['user_1']);
$this->assertSame(self::$DI['basket_4']->getId(), $token->getData());
@@ -48,7 +48,7 @@ class TokenManipulatorTest extends \PhraseanetTestCase
public function testCreateBasketValidationTokenWithoutUser()
{
$manipulator = new TokenManipulator(self::$DI['app']['EM'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$manipulator = new TokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$token = $manipulator->createBasketValidationToken(self::$DI['basket_4']);
$this->assertSame(self::$DI['basket_4']->getId(), $token->getData());
@@ -59,14 +59,14 @@ class TokenManipulatorTest extends \PhraseanetTestCase
public function testCreateBasketValidationTokenWithInvalidBasket()
{
$manipulator = new TokenManipulator(self::$DI['app']['EM'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$manipulator = new TokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$this->setExpectedException('InvalidArgumentException', 'A validation token requires a validation basket.');
$manipulator->createBasketValidationToken(self::$DI['basket_1']);
}
public function testCreateBasketAccessToken()
{
$manipulator = new TokenManipulator(self::$DI['app']['EM'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$manipulator = new TokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$token = $manipulator->createBasketAccessToken(self::$DI['basket_4'], self::$DI['user']);
$this->assertSame(self::$DI['basket_4']->getId(), $token->getData());
@@ -77,7 +77,7 @@ class TokenManipulatorTest extends \PhraseanetTestCase
public function testCreateFeedEntryToken()
{
$manipulator = new TokenManipulator(self::$DI['app']['EM'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$manipulator = new TokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$token = $manipulator->createFeedEntryToken(self::$DI['user'], self::$DI['feed_public_entry']);
$this->assertSame(self::$DI['feed_public_entry']->getId(), $token->getData());
@@ -89,7 +89,7 @@ class TokenManipulatorTest extends \PhraseanetTestCase
public function testCreateDownloadToken()
{
$data = serialize(['some' => 'data']);
$manipulator = new TokenManipulator(self::$DI['app']['EM'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$manipulator = new TokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$token = $manipulator->createDownloadToken(self::$DI['user'], $data);
$this->assertSame($data, $token->getData());
@@ -101,7 +101,7 @@ class TokenManipulatorTest extends \PhraseanetTestCase
public function testCreateEmailExportToken()
{
$data = serialize(['some' => 'data']);
$manipulator = new TokenManipulator(self::$DI['app']['EM'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$manipulator = new TokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$token = $manipulator->createEmailExportToken($data);
$this->assertSame($data, $token->getData());
@@ -112,7 +112,7 @@ class TokenManipulatorTest extends \PhraseanetTestCase
public function testCreateResetEmailToken()
{
$manipulator = new TokenManipulator(self::$DI['app']['EM'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$manipulator = new TokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$token = $manipulator->createResetEmailToken(self::$DI['user'], 'newemail@phraseanet.com');
$this->assertSame('newemail@phraseanet.com', $token->getData());
@@ -123,7 +123,7 @@ class TokenManipulatorTest extends \PhraseanetTestCase
public function testCreateAccountUnlockToken()
{
$manipulator = new TokenManipulator(self::$DI['app']['EM'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$manipulator = new TokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$token = $manipulator->createAccountUnlockToken(self::$DI['user']);
$this->assertNull($token->getData());
@@ -134,7 +134,7 @@ class TokenManipulatorTest extends \PhraseanetTestCase
public function testCreateResetPasswordToken()
{
$manipulator = new TokenManipulator(self::$DI['app']['EM'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$manipulator = new TokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$token = $manipulator->createResetPasswordToken(self::$DI['user']);
$this->assertNull($token->getData());
@@ -177,7 +177,7 @@ class TokenManipulatorTest extends \PhraseanetTestCase
{
$this->assertCount(4, self::$DI['app']['repo.tokens']->findAll());
$manipulator = new TokenManipulator(self::$DI['app']['EM'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$manipulator = new TokenManipulator(self::$DI['app']['orm.em'], self::$DI['app']['random.low'], self::$DI['app']['repo.tokens']);
$manipulator->removeExpiredTokens();
$this->assertCount(3, self::$DI['app']['repo.tokens']->findAll());

20
tests/Alchemy/Tests/Phrasea/Model/Manipulator/WebhookEventDeliveryManipulatorTest.php
View File

@@ -10,7 +10,7 @@ class WebhookEventDeliveryManipulatorTest extends \PhraseanetTestCase
{
public function testCreate()
{
$manipApp = new ApiApplicationManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$manipApp = new ApiApplicationManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$application = $manipApp->create(
uniqid('app'),
ApiApplication::WEB_TYPE,
@@ -20,7 +20,7 @@ class WebhookEventDeliveryManipulatorTest extends \PhraseanetTestCase
'http://web-app-url.net/callback'
);
$manipulator = new WebhookEventDeliveryManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.webhook-delivery']);
$manipulator = new WebhookEventDeliveryManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.webhook-delivery']);
$nbHooks = count(self::$DI['app']['repo.webhook-delivery']->findAll());
$manipulator->create($application, self::$DI['webhook-event']);
$this->assertGreaterThan($nbHooks, count(self::$DI['app']['repo.webhook-delivery']->findAll()));
@@ -28,7 +28,7 @@ class WebhookEventDeliveryManipulatorTest extends \PhraseanetTestCase
public function testDelete()
{
$manipApp = new ApiApplicationManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$manipApp = new ApiApplicationManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$application = $manipApp->create(
uniqid('app'),
ApiApplication::WEB_TYPE,
@@ -37,7 +37,7 @@ class WebhookEventDeliveryManipulatorTest extends \PhraseanetTestCase
self::$DI['user'],
'http://web-app-url.net/callback'
);
$manipulator = new WebhookEventDeliveryManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.webhook-delivery']);
$manipulator = new WebhookEventDeliveryManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.webhook-delivery']);
$eventDelivery = $manipulator->create($application, self::$DI['webhook-event']);
$countBefore = count(self::$DI['app']['repo.webhook-delivery']->findAll());
$manipulator->delete($eventDelivery);
@@ -46,7 +46,7 @@ class WebhookEventDeliveryManipulatorTest extends \PhraseanetTestCase
public function testUpdate()
{
$manipApp = new ApiApplicationManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$manipApp = new ApiApplicationManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$application = $manipApp->create(
uniqid('app'),
ApiApplication::WEB_TYPE,
@@ -55,7 +55,7 @@ class WebhookEventDeliveryManipulatorTest extends \PhraseanetTestCase
self::$DI['user'],
'http://web-app-url.net/callback'
);
$manipulator = new WebhookEventDeliveryManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.webhook-delivery']);
$manipulator = new WebhookEventDeliveryManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.webhook-delivery']);
$eventDelivery = $manipulator->create($application, self::$DI['webhook-event']);
$this->assertEquals(0, $eventDelivery->getDeliveryTries());
$eventDelivery->setDeliverTries(1);
@@ -66,7 +66,7 @@ class WebhookEventDeliveryManipulatorTest extends \PhraseanetTestCase
public function testDeliverySuccess()
{
$manipApp = new ApiApplicationManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$manipApp = new ApiApplicationManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$application = $manipApp->create(
uniqid('app'),
ApiApplication::WEB_TYPE,
@@ -75,7 +75,7 @@ class WebhookEventDeliveryManipulatorTest extends \PhraseanetTestCase
self::$DI['user'],
'http://web-app-url.net/callback'
);
$manipulator = new WebhookEventDeliveryManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.webhook-delivery']);
$manipulator = new WebhookEventDeliveryManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.webhook-delivery']);
$eventDelivery = $manipulator->create($application, self::$DI['webhook-event']);
$tries = $eventDelivery->getDeliveryTries();
$manipulator->deliverySuccess($eventDelivery);
@@ -85,7 +85,7 @@ class WebhookEventDeliveryManipulatorTest extends \PhraseanetTestCase
public function testDeliveryFailure()
{
$manipApp = new ApiApplicationManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$manipApp = new ApiApplicationManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.api-applications'], self::$DI['app']['random.medium']);
$application = $manipApp->create(
uniqid('app'),
ApiApplication::WEB_TYPE,
@@ -94,7 +94,7 @@ class WebhookEventDeliveryManipulatorTest extends \PhraseanetTestCase
self::$DI['user'],
'http://web-app-url.net/callback'
);
$manipulator = new WebhookEventDeliveryManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.webhook-delivery']);
$manipulator = new WebhookEventDeliveryManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.webhook-delivery']);
$eventDelivery = $manipulator->create($application, self::$DI['webhook-event']);
$tries = $eventDelivery->getDeliveryTries();
$manipulator->deliveryFailure($eventDelivery);

8
tests/Alchemy/Tests/Phrasea/Model/Manipulator/WebhookEventManipulatorTest.php
View File

@@ -9,7 +9,7 @@ class WebhookEventManipulatorTest extends \PhraseanetTestCase
{
public function testCreate()
{
$manipulator = new WebhookEventManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.webhook-delivery']);
$manipulator = new WebhookEventManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.webhook-delivery']);
$nbEvents = count(self::$DI['app']['repo.webhook-event']->findAll());
$event = $manipulator->create(WebhookEvent::NEW_FEED_ENTRY, WebhookEvent::FEED_ENTRY_TYPE, [
'feed_id' => self::$DI['feed_public_entry']->getFeed()->getId(), 'entry_id' => self::$DI['feed_public_entry']->getId()
@@ -19,7 +19,7 @@ class WebhookEventManipulatorTest extends \PhraseanetTestCase
public function testDelete()
{
$manipulator = new WebhookEventManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.webhook-event']);
$manipulator = new WebhookEventManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.webhook-event']);
$event = $manipulator->create(WebhookEvent::NEW_FEED_ENTRY, WebhookEvent::FEED_ENTRY_TYPE, [
'feed_id' => self::$DI['feed_public_entry']->getFeed()->getId(), 'entry_id' => self::$DI['feed_public_entry']->getId()
]);
@@ -30,7 +30,7 @@ class WebhookEventManipulatorTest extends \PhraseanetTestCase
public function testUpdate()
{
$manipulator = new WebhookEventManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.webhook-event']);
$manipulator = new WebhookEventManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.webhook-event']);
$event = $manipulator->create(WebhookEvent::NEW_FEED_ENTRY, WebhookEvent::FEED_ENTRY_TYPE, [
'feed_id' => self::$DI['feed_public_entry']->getFeed()->getId(), 'entry_id' => self::$DI['feed_public_entry']->getId()
]);
@@ -42,7 +42,7 @@ class WebhookEventManipulatorTest extends \PhraseanetTestCase
public function testProcessed()
{
$manipulator = new WebhookEventManipulator(self::$DI['app']['EM'], self::$DI['app']['repo.webhook-event']);
$manipulator = new WebhookEventManipulator(self::$DI['app']['orm.em'], self::$DI['app']['repo.webhook-event']);
$event = $manipulator->create(WebhookEvent::NEW_FEED_ENTRY, WebhookEvent::FEED_ENTRY_TYPE, [
'feed_id' => self::$DI['feed_public_entry']->getFeed()->getId(), 'entry_id' => self::$DI['feed_public_entry']->getId()
]);

2
tests/Alchemy/Tests/Phrasea/Model/Repositories/ApiAccountRepositoryTest.php
View File

@@ -6,7 +6,7 @@ class ApiAccountRepositoryTest extends \PhraseanetTestCase
{
public function testFindByUserAndApplication()
{
$acc = self::$DI['app']['EM']->getRepository('Phraseanet:ApiAccount')->findByUserAndApplication(self::$DI['user_notAdmin'], self::$DI['oauth2-app-user-not-admin']);
$acc = self::$DI['app']['orm.em']->getRepository('Phraseanet:ApiAccount')->findByUserAndApplication(self::$DI['user_notAdmin'], self::$DI['oauth2-app-user-not-admin']);
$this->assertEquals(1, count($acc));
}
}

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

@@ -8,19 +8,19 @@ class ApiApplicationRepositoryTest extends \PhraseanetTestCase
{
public function testFindByCreator()
{
$app = self::$DI['app']['EM']->getRepository('Phraseanet:ApiApplication')->findByCreator(self::$DI['user']);
$app = self::$DI['app']['orm.em']->getRepository('Phraseanet:ApiApplication')->findByCreator(self::$DI['user']);
$this->assertCount(1, $app);
}
public function testFindByUser()
{
$app = self::$DI['app']['EM']->getRepository('Phraseanet:ApiApplication')->findByUser(self::$DI['user']);
$app = self::$DI['app']['orm.em']->getRepository('Phraseanet:ApiApplication')->findByUser(self::$DI['user']);
$this->assertCount(1, $app);
}
public function testFindAuthorizedAppsByUser()
{
$app = self::$DI['app']['EM']->getRepository('Phraseanet:ApiApplication')->findAuthorizedAppsByUser(self::$DI['user']);
$app = self::$DI['app']['orm.em']->getRepository('Phraseanet:ApiApplication')->findAuthorizedAppsByUser(self::$DI['user']);
$this->assertCount(1, $app);
}
}

2
tests/Alchemy/Tests/Phrasea/Model/Repositories/ApiOauthCodeRepositoryTest.php
View File

@@ -7,7 +7,7 @@ class ApiOauthCodeRepositoryTest extends \PhraseanetTestCase
public function testFindByAccount()
{
self::$DI['app']['manipulator.api-oauth-code']->create(self::$DI['oauth2-app-acc-user'], 'http://www.callback.fr', time() + 40);
$codes = self::$DI['app']['EM']->getRepository('Phraseanet:ApiOauthCode')->findByAccount(self::$DI['oauth2-app-acc-user']);
$codes = self::$DI['app']['orm.em']->getRepository('Phraseanet:ApiOauthCode')->findByAccount(self::$DI['oauth2-app-acc-user']);
$this->assertGreaterThan(0, count($codes));
}
}

4
tests/Alchemy/Tests/Phrasea/Model/Repositories/ApiOauthTokenRepositoryTest.php
View File

@@ -6,13 +6,13 @@ class ApiOauthTokenRepositoryTest extends \PhraseanetTestCase
{
public function testFindDeveloperToken()
{
$tok = self::$DI['app']['EM']->getRepository('Phraseanet:ApiOauthToken')->findByAccount(self::$DI['oauth2-app-acc-user']);
$tok = self::$DI['app']['orm.em']->getRepository('Phraseanet:ApiOauthToken')->findByAccount(self::$DI['oauth2-app-acc-user']);
$this->assertNotNull($tok);
}
public function testFindOauthTokens()
{
$tokens = self::$DI['app']['EM']->getRepository('Phraseanet:ApiOauthToken')->findOauthTokens(self::$DI['oauth2-app-acc-user']);
$tokens = self::$DI['app']['orm.em']->getRepository('Phraseanet:ApiOauthToken')->findOauthTokens(self::$DI['oauth2-app-acc-user']);
$this->assertGreaterThan(0, count($tokens));
}
}

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

@@ -9,28 +9,28 @@ class FeedItemRepositoryTest extends \PhraseanetTestCase
public function testIs_record_in_public_feedInPublicFeed()
{
$record = self::$DI['record_7'];
$this->assertTrue(self::$DI['app']['EM']->getRepository('Phraseanet:FeedItem')->isRecordInPublicFeed(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()));
$this->assertTrue(self::$DI['app']['orm.em']->getRepository('Phraseanet:FeedItem')->isRecordInPublicFeed(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()));
}
public function testIs_record_in_public_feedInPrivateFeed()
{
$record = self::$DI['record_2'];
$this->assertFalse(self::$DI['app']['EM']->getRepository('Phraseanet:FeedItem')->isRecordInPublicFeed(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()));
$this->assertFalse(self::$DI['app']['orm.em']->getRepository('Phraseanet:FeedItem')->isRecordInPublicFeed(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()));
}
public function testLoadLatestItems()
{
$this->assertCount(3, self::$DI['app']['EM']->getRepository('Phraseanet:FeedItem')->loadLatest(self::$DI['app'], 20));
$this->assertCount(3, self::$DI['app']['orm.em']->getRepository('Phraseanet:FeedItem')->loadLatest(self::$DI['app'], 20));
}
public function testLoadLatestItemsLessItems()
{
$this->assertCount(1, self::$DI['app']['EM']->getRepository('Phraseanet:FeedItem')->loadLatest(self::$DI['app'], 1));
$this->assertCount(1, self::$DI['app']['orm.em']->getRepository('Phraseanet:FeedItem')->loadLatest(self::$DI['app'], 1));
}
public function testLoadLatestWithDeletedDatabox()
{
$feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 2);
$feed = self::$DI['app']['orm.em']->find('Phraseanet:Feed', 2);
$entry = $feed->getEntries()->first();
$item = new FeedItem();
$item->setEntry($entry)
@@ -39,7 +39,7 @@ class FeedItemRepositoryTest extends \PhraseanetTestCase
->setSbasId(0);
$entry->addItem($item);
self::$DI['app']['EM']->persist($item);
self::$DI['app']['orm.em']->persist($item);
$item = new FeedItem();
$item->setEntry($entry)
@@ -48,7 +48,7 @@ class FeedItemRepositoryTest extends \PhraseanetTestCase
->setSbasId(self::$DI['record_1']->get_sbas_id());
$entry->addItem($item);
self::$DI['app']['EM']->persist($item);
self::$DI['app']['orm.em']->persist($item);
$item = new FeedItem();
$item->setEntry($entry)
@@ -56,11 +56,11 @@ class FeedItemRepositoryTest extends \PhraseanetTestCase
->setRecordId(123456789)
->setSbasId(123456789);
$entry->addItem($item);
self::$DI['app']['EM']->persist($item);
self::$DI['app']['orm.em']->persist($item);
self::$DI['app']['EM']->persist($entry);
self::$DI['app']['EM']->flush();
self::$DI['app']['orm.em']->persist($entry);
self::$DI['app']['orm.em']->flush();
$this->assertCount(3, self::$DI['app']['EM']->getRepository('Phraseanet:FeedItem')->loadLatest(self::$DI['app'], 20));
$this->assertCount(3, self::$DI['app']['orm.em']->getRepository('Phraseanet:FeedItem')->loadLatest(self::$DI['app'], 20));
}
}

50
tests/Alchemy/Tests/Phrasea/Model/Repositories/FtpExportRepositoryTest.php
View File

@@ -38,13 +38,13 @@ class FtpExportRepositoryTest extends \PhraseanetTestCase
->setCrash(12)
->setNbretry(23);
self::$DI['app']['EM']->persist($failure1);
self::$DI['app']['EM']->persist($failure2);
self::$DI['app']['EM']->persist($good1);
self::$DI['app']['EM']->persist($good2);
self::$DI['app']['EM']->flush();
self::$DI['app']['orm.em']->persist($failure1);
self::$DI['app']['orm.em']->persist($failure2);
self::$DI['app']['orm.em']->persist($good1);
self::$DI['app']['orm.em']->persist($good2);
self::$DI['app']['orm.em']->flush();
$crashed = self::$DI['app']['EM']
$crashed = self::$DI['app']['orm.em']
->getRepository('Phraseanet:FtpExport')
->findCrashedExports();
@@ -55,7 +55,7 @@ class FtpExportRepositoryTest extends \PhraseanetTestCase
public function testFindCrashedExportsWithDate()
{
self::$DI['app']['EM']->getEventManager()->removeEventSubscriber(new TimestampableListener());
self::$DI['app']['orm.em']->getEventManager()->removeEventSubscriber(new TimestampableListener());
$failure1 = new FtpExport();
$failure1
@@ -97,14 +97,14 @@ class FtpExportRepositoryTest extends \PhraseanetTestCase
->setNbretry(23)
->setCreated(new \DateTime('-6 days'));
self::$DI['app']['EM']->persist($failure1);
self::$DI['app']['EM']->persist($failure2);
self::$DI['app']['EM']->persist($good1);
self::$DI['app']['EM']->persist($good2);
self::$DI['app']['EM']->persist($good3);
self::$DI['app']['EM']->flush();
self::$DI['app']['orm.em']->persist($failure1);
self::$DI['app']['orm.em']->persist($failure2);
self::$DI['app']['orm.em']->persist($good1);
self::$DI['app']['orm.em']->persist($good2);
self::$DI['app']['orm.em']->persist($good3);
self::$DI['app']['orm.em']->flush();
$crashed = self::$DI['app']['EM']
$crashed = self::$DI['app']['orm.em']
->getRepository('Phraseanet:FtpExport')
->findCrashedExports(new \DateTime('-6 days'));
@@ -179,14 +179,14 @@ class FtpExportRepositoryTest extends \PhraseanetTestCase
$elem4->setExport($doable2);
$doable2->addElement($elem4);
self::$DI['app']['EM']->persist($notDoable1);
self::$DI['app']['EM']->persist($notDoable2);
self::$DI['app']['EM']->persist($doable1);
self::$DI['app']['EM']->persist($doable2);
self::$DI['app']['orm.em']->persist($notDoable1);
self::$DI['app']['orm.em']->persist($notDoable2);
self::$DI['app']['orm.em']->persist($doable1);
self::$DI['app']['orm.em']->persist($doable2);
self::$DI['app']['EM']->flush();
self::$DI['app']['orm.em']->flush();
$doables = self::$DI['app']['EM']
$doables = self::$DI['app']['orm.em']
->getRepository('Phraseanet:FtpExport')
->findDoableExports();
@@ -212,13 +212,13 @@ class FtpExportRepositoryTest extends \PhraseanetTestCase
->setAddr('No match 1')
->setUser(self::$DI['user_alt1']);
self::$DI['app']['EM']->persist($match1);
self::$DI['app']['EM']->persist($match2);
self::$DI['app']['EM']->persist($noMatch1);
self::$DI['app']['orm.em']->persist($match1);
self::$DI['app']['orm.em']->persist($match2);
self::$DI['app']['orm.em']->persist($noMatch1);
self::$DI['app']['EM']->flush();
self::$DI['app']['orm.em']->flush();
$exports = self::$DI['app']['EM']
$exports = self::$DI['app']['orm.em']
->getRepository('Phraseanet:FtpExport')
->findByUser(self::$DI['user']);

14
tests/Alchemy/Tests/Phrasea/Model/Repositories/TaskRepositoryTest.php
View File

@@ -8,20 +8,20 @@ class TaskRepositoryTest extends \PhraseanetTestCase
{
public function testFindActiveTask()
{
$task1 = self::$DI['app']['EM']->find('Phraseanet:Task', 1);
$task1 = self::$DI['app']['orm.em']->find('Phraseanet:Task', 1);
$task1->setStatus(Task::STATUS_STOPPED);
$task2 = self::$DI['app']['EM']->find('Phraseanet:Task', 2);
$task2 = self::$DI['app']['orm.em']->find('Phraseanet:Task', 2);
self::$DI['app']['EM']->persist($task1);
self::$DI['app']['EM']->flush();
self::$DI['app']['orm.em']->persist($task1);
self::$DI['app']['orm.em']->flush();
$repository = self::$DI['app']['EM']->getRepository('Phraseanet:Task');
$repository = self::$DI['app']['orm.em']->getRepository('Phraseanet:Task');
$this->assertSame([$task2], $repository->findActiveTasks());
$task1->setStatus(Task::STATUS_STARTED);
self::$DI['app']['EM']->persist($task1);
self::$DI['app']['EM']->flush();
self::$DI['app']['orm.em']->persist($task1);
self::$DI['app']['orm.em']->flush();
$this->assertSame([$task1, $task2], $repository->findActiveTasks());
}

8
tests/Alchemy/Tests/Phrasea/Model/Repositories/UserRepositoryTest.php
View File

@@ -8,20 +8,20 @@ class UserRepositoryTest extends \PhraseanetTestCase
{
public function testFindAdminsWithNoAdmins()
{
$users = self::$DI['app']['EM']->getRepository('Phraseanet:User')->findAdmins();
$users = self::$DI['app']['orm.em']->getRepository('Phraseanet:User')->findAdmins();
$this->assertEquals(2, count($users));
}
public function testFindByLogin()
{
$user = self::$DI['app']['EM']->getRepository('Phraseanet:User')->findByLogin('user1');
$user = self::$DI['app']['orm.em']->getRepository('Phraseanet:User')->findByLogin('user1');
$this->assertInstanceOf('Alchemy\Phrasea\Model\Entities\User', $user);
$this->assertNull(self::$DI['app']['EM']->getRepository('Phraseanet:User')->findByLogin('wrong-login'));
$this->assertNull(self::$DI['app']['orm.em']->getRepository('Phraseanet:User')->findByLogin('wrong-login'));
}
public function testFindUserByEmail()
{
$user = self::$DI['app']['EM']->getRepository('Phraseanet:User')->findByEmail('user2@phraseanet.com');
$user = self::$DI['app']['orm.em']->getRepository('Phraseanet:User')->findByEmail('user2@phraseanet.com');
$this->assertInstanceOf('Alchemy\Phrasea\Model\Entities\User', $user);
}
}

2
tests/Alchemy/Tests/Phrasea/Model/Repositories/WebhookEventDeliveryRepositoryTest.php
View File

@@ -6,7 +6,7 @@ class WebhookEventDeliveryRepositoryTest extends \PhraseanetTestCase
{
public function testFindUndeliveredEvents()
{
$events = self::$DI['app']['EM']->getRepository('Phraseanet:WebhookEventDelivery')->findUndeliveredEvents();
$events = self::$DI['app']['orm.em']->getRepository('Phraseanet:WebhookEventDelivery')->findUndeliveredEvents();
$this->assertCount(1, $events);
}
}

2
tests/Alchemy/Tests/Phrasea/Model/Repositories/WebhookEventRepositoryTest.php
View File

@@ -6,7 +6,7 @@ class WebhookEventRepositoryTest extends \PhraseanetTestCase
{
public function testFindUnprocessedEvents()
{
$events = self::$DI['app']['EM']->getRepository('Phraseanet:WebhookEvent')->findUnprocessedEvents();
$events = self::$DI['app']['orm.em']->getRepository('Phraseanet:WebhookEvent')->findUnprocessedEvents();
$this->assertCount(1, $events);
}
}