Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-24 08:33:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Improve person accompanyingPeriod validation - close #410

Browse Source
This commit is contained in:
Marc Ducobu
2015-03-06 20:36:21 +01:00
parent c80326d0ed
commit 5634a19174
5 changed files with 110 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Tests/Controller/AccompanyingPeriodControllerTest.php
View File

@@ -29,8 +29,9 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
/**
* Test the creation or deletion of accompanying periods
*
* @author Julien Fastré <julien.fastre@champs-libres.coop>
*
* The person on which the test is done has a (current) period opened (and not
* closed) starting the 2015-01-05.
*/
class AccompanyingPeriodControllerTest extends WebTestCase
{
@@ -56,14 +57,19 @@ class AccompanyingPeriodControllerTest extends WebTestCase
const CLOSING_INPUT = 'chill_personbundle_accompanyingperiod[date_closing]';
const CLOSING_MOTIVE_INPUT = 'chill_personbundle_accompanyingperiod[closingMotive]';
/**
* Setup before the first test of this class (see phpunit doc)
*/
public static function setUpBeforeClass()
{
static::bootKernel();
static::$em = static::$kernel->getContainer()
->get('doctrine.orm.entity_manager');
}
/**
* Setup before each test method (see phpunit doc)
*/
public function setUp()
{
$this->client = static::createClient(array(), array(
@@ -74,13 +80,15 @@ class AccompanyingPeriodControllerTest extends WebTestCase
$this->person = (new Person(new \DateTime('2015-01-05')))
->setFirstName('Roland')
->setLastName('Gallorime')
->setGenre(Person::GENRE_MAN)
;
->setGenre(Person::GENRE_MAN);
static::$em->persist($this->person);
static::$em->flush();
}
/**
* TearDown after each test method (see phpunit doc)
*/
public function tearDown()
{
static::$em->refresh($this->person);
@@ -207,7 +215,6 @@ class AccompanyingPeriodControllerTest extends WebTestCase
*/
public function testAddNewPeriodBeforeActual()
{
$crawler = $this->client->request('GET', '/en/person/'
.$this->person->getId().'/accompanying-period/create');
@@ -244,8 +251,6 @@ class AccompanyingPeriodControllerTest extends WebTestCase
*/
public function testCreatePeriodWithClosingAfterCurrentFails()
{
$this->markTestSkipped('this feature is not yet implemented');
$crawler = $this->client->request('GET', '/en/person/'
.$this->person->getId().'/accompanying-period/create');
@@ -280,8 +285,6 @@ class AccompanyingPeriodControllerTest extends WebTestCase
*/
public function testCreatePeriodWithOpeningAndClosingAfterCurrentFails()
{
$this->markTestSkipped('this feature is not yet implemented');
$crawler = $this->client->request('GET', '/en/person/'
.$this->person->getId().'/accompanying-period/create');

8
Tests/Entity/PersonTest.php
View File

@@ -126,9 +126,9 @@ class PersonTest extends \PHPUnit_Framework_TestCase
$period = $p->getCurrentAccompanyingPeriod()->setDateClosing($g);
$p->close($period);
$r = $p->checkAccompanyingPeriodIsNotCovering();
$r = $p->checkAccompanyingPeriodsAreNotCollapsing();
$this->assertEquals($r['result'], Person::ERROR_OPENING_IS_INSIDE_CLOSING);
$this->assertEquals($r['result'], Person::ERROR_PERIODS_ARE_COLLAPSING);
}
/**
@@ -147,8 +147,8 @@ class PersonTest extends \PHPUnit_Framework_TestCase
$f = new \DateTime("2013/1/1");
$p->open(new AccompanyingPeriod($f));
$r = $p->checkAccompanyingPeriodIsNotCovering();
$r = $p->checkAccompanyingPeriodsAreNotCollapsing();
$this->assertEquals($r['result'], Person::ERROR_OPENING_NOT_CLOSED_IS_BEFORE_NEW_LINE);
$this->assertEquals($r['result'], Person::ERROR_ADDIND_PERIOD_AFTER_AN_OPEN_PERIOD);
}
}