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

Fix tests

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-11-21 17:41:37 +01:00
parent e21d9c1a1d
commit 640a8ee314
5 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
View File

@@ -268,10 +268,6 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic
$response = self::$DI['client']->getResponse(); $response = self::$DI['client']->getResponse();
$this->assertTrue($response->isRedirect()); $this->assertTrue($response->isRedirect());
$this->assertNull($feed->getId());
$feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', $feed->getId());
if (null !== $feed) {
$this->fail("fail deleting feed");
}
} }
} }

12
tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
View File

@@ -11,12 +11,12 @@ class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
*/ */
public function testRouteSlash() public function testRouteSlash()
{ {
$entry1 = $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user']); $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user']);
$entry2 = $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user_alt1']); $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user_alt1']);
$entry3 = $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user']); $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user']);
$entry4 = $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user_alt1']); $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user_alt1']);
$entry5 = $this->insertOneUsrListEntry(self::$DI['user_alt1'], self::$DI['user_alt1']); $this->insertOneUsrListEntry(self::$DI['user_alt1'], self::$DI['user_alt1']);
$entry6 = $this->insertOneUsrListEntry(self::$DI['user_alt1'], self::$DI['user_alt2']); $this->insertOneUsrListEntry(self::$DI['user_alt1'], self::$DI['user_alt2']);
$route = '/prod/lists/all/'; $route = '/prod/lists/all/';

8
tests/Alchemy/Tests/Phrasea/Model/Entities/UserTest.php
View File

@@ -117,10 +117,10 @@ class UserTest extends \PhraseanetPHPUnitAbstract
public function testSetModelOf() public function testSetModelOf()
{ {
$user1 = $this->insertOneUser('login'); $template = $this->insertOneUser('login');
$user2 = $this->insertOneUser('login2'); $user = $this->insertOneUser('login2');
$user1->setModelOf($user2); $template->setModelOf($user);
$this->assertEquals('login3', $user1->getModelOf()->getLogin()); $this->assertEquals('login2', $template->getModelOf()->getLogin());
} }
public function genderProvider() public function genderProvider()

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

@@ -23,7 +23,7 @@ class UserRepositoryTest extends \PhraseanetPHPUnitAbstract
public function testFindAdminsWithOneAdminButTemplate() public function testFindAdminsWithOneAdminButTemplate()
{ {
$user = $this->insertOneUser('login'); $user = $this->insertOneUser('login');
$template = $this->insertOneUser('login', null, true); $template = $this->insertOneUser('login2', null, true);
$template->setModelOf($user); $template->setModelOf($user);

38
tests/classes/PhraseanetPHPUnitAbstract.php
View File

@@ -22,6 +22,7 @@ use Alchemy\Phrasea\Model\Entities\ValidationParticipant;
use Alchemy\Phrasea\Model\Entities\UsrListOwner; use Alchemy\Phrasea\Model\Entities\UsrListOwner;
use Alchemy\Phrasea\Model\Entities\UsrList; use Alchemy\Phrasea\Model\Entities\UsrList;
use Alchemy\Phrasea\Model\Entities\UsrListEntry; use Alchemy\Phrasea\Model\Entities\UsrListEntry;
use Alchemy\Phrasea\Model\Entities\StoryWZ;
use Silex\WebTestCase; use Silex\WebTestCase;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Client; use Symfony\Component\HttpKernel\Client;
@@ -521,13 +522,13 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
} }
/** /**
* Inserts one user list. * Inserts one user list owner.
* *
* @param User_Adapter $user * @param User_Adapter $user
* *
* @return UsrListOwner * @return UsrListOwner
*/ */
protected function insertOneUsrList(\User_Adapter $user = null) protected function insertOneUsrListOwner(\User_Adapter $user = null)
{ {
$user = $user ?: self::$DI['user']; $user = $user ?: self::$DI['user'];
@@ -541,6 +542,27 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
return $owner; return $owner;
} }
/**
* Inserts one user list.
*
* @param User_Adapter $user
*
* @return UsrListOwner
*/
protected function insertOneUsrList(\User_Adapter $user = null)
{
$owner = $this->insertOneUsrListOwner($user);
$list = new UsrList();
$list->setName('new list');
$list->addOwner($owner);
$owner->setList($list);
self::$DI['app']['EM']->persist($list);
self::$DI['app']['EM']->flush();
return $list;
}
/** /**
* Insert one user list entry. * Insert one user list entry.
* *
@@ -551,14 +573,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
*/ */
protected function insertOneUsrListEntry(\User_adapter $owner, \User_adapter $user) protected function insertOneUsrListEntry(\User_adapter $owner, \User_adapter $user)
{ {
$listOwner = new UsrListOwner(); $list = $this->insertOneUsrList($owner);
$listOwner->setRole(UsrListOwner::ROLE_ADMIN);
$listOwner->setUser($owner);
$list = new UsrList();
$list->addOwner($listOwner);
$listOwner->setList($list);
$entry = new UsrListEntry(); $entry = new UsrListEntry();
$entry->setUser($user); $entry->setUser($user);
@@ -568,7 +583,6 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
self::$DI['app']['EM']->persist($entry); self::$DI['app']['EM']->persist($entry);
self::$DI['app']['EM']->persist($list); self::$DI['app']['EM']->persist($list);
self::$DI['app']['EM']->persist($listOwner);
self::$DI['app']['EM']->flush(); self::$DI['app']['EM']->flush();
return $entry; return $entry;
@@ -779,7 +793,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
*/ */
protected function insertOneUser($login, $email = null, $admin = false) protected function insertOneUser($login, $email = null, $admin = false)
{ {
return self::$DI['app']['manipulator.user']->create($login, uniqid('pass'), $email, $admin); return self::$DI['app']['manipulator.user']->createUser($login, uniqid('pass'), $email, $admin);
} }
/** /**