diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.4'

Browse Source 
* 2.4:
  [Process] Fix Process test suite
  [Form] Fixed infinite tests when ICU is available
This commit is contained in:
Fabien Potencier 2014-04-02 19:10:49 +02:00
commit b7be0b86b9
5 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
View File

@ -433,8 +433,8 @@ class DateTimeTypeTest extends TypeTestCase
$form['date']->addError($error);
$this->assertSame(array(), $form['date']->getErrors());
$this->assertSame(array($error), $form->getErrors());
$this->assertSame(array(), iterator_to_array($form['date']->getErrors()));
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
}
public function testDateTypeSingleTextErrorsBubbleUp()
@ -446,8 +446,8 @@ class DateTimeTypeTest extends TypeTestCase
$form['date']->addError($error);
$this->assertSame(array(), $form['date']->getErrors());
$this->assertSame(array($error), $form->getErrors());
$this->assertSame(array(), iterator_to_array($form['date']->getErrors()));
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
}
public function testTimeTypeChoiceErrorsBubbleUp()
@ -457,8 +457,8 @@ class DateTimeTypeTest extends TypeTestCase
$form['time']->addError($error);
$this->assertSame(array(), $form['time']->getErrors());
$this->assertSame(array($error), $form->getErrors());
$this->assertSame(array(), iterator_to_array($form['time']->getErrors()));
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
}
public function testTimeTypeSingleTextErrorsBubbleUp()
@ -470,8 +470,8 @@ class DateTimeTypeTest extends TypeTestCase
$form['time']->addError($error);
$this->assertSame(array(), $form['time']->getErrors());
$this->assertSame(array($error), $form->getErrors());
$this->assertSame(array(), iterator_to_array($form['time']->getErrors()));
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
}
}

12
src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
View File

@ -745,8 +745,8 @@ class DateTypeTest extends TypeTestCase
));
$form['year']->addError($error);
$this->assertSame(array(), $form['year']->getErrors());
$this->assertSame(array($error), $form->getErrors());
$this->assertSame(array(), iterator_to_array($form['year']->getErrors()));
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
}
/**
@ -760,8 +760,8 @@ class DateTypeTest extends TypeTestCase
));
$form['month']->addError($error);
$this->assertSame(array(), $form['month']->getErrors());
$this->assertSame(array($error), $form->getErrors());
$this->assertSame(array(), iterator_to_array($form['month']->getErrors()));
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
}
/**
@ -775,8 +775,8 @@ class DateTypeTest extends TypeTestCase
));
$form['day']->addError($error);
$this->assertSame(array(), $form['day']->getErrors());
$this->assertSame(array($error), $form->getErrors());
$this->assertSame(array(), iterator_to_array($form['day']->getErrors()));
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
}
public function testYearsFor32BitsMachines()

12
src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
View File

@ -601,8 +601,8 @@ class TimeTypeTest extends TypeTestCase
));
$form['hour']->addError($error);
$this->assertSame(array(), $form['hour']->getErrors());
$this->assertSame(array($error), $form->getErrors());
$this->assertSame(array(), iterator_to_array($form['hour']->getErrors()));
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
}
/**
@ -616,8 +616,8 @@ class TimeTypeTest extends TypeTestCase
));
$form['minute']->addError($error);
$this->assertSame(array(), $form['minute']->getErrors());
$this->assertSame(array($error), $form->getErrors());
$this->assertSame(array(), iterator_to_array($form['minute']->getErrors()));
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
}
/**
@ -632,8 +632,8 @@ class TimeTypeTest extends TypeTestCase
));
$form['second']->addError($error);
$this->assertSame(array(), $form['second']->getErrors());
$this->assertSame(array($error), $form->getErrors());
$this->assertSame(array(), iterator_to_array($form['second']->getErrors()));
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
}
/**

13
src/Symfony/Component/Process/Tests/AbstractProcessTest.php
View File

@ -313,10 +313,15 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function testMustRun()
{
$process = $this->getProcess('echo "foo"');
$process = $this->getProcess('echo foo');
$this->assertSame($process, $process->mustRun());
$this->assertEquals("foo\n", $process->getOutput());
$this->assertEquals("foo".PHP_EOL, $process->getOutput());
}
public function testSuccessfulMustRunHasCorrectExitCode()
{
$process = $this->getProcess('echo foo')->mustRun();
$this->assertEquals(0, $process->getExitCode());
}
@ -612,7 +617,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
*/
public function testIdleTimeout()
{
$process = $this->getProcess('sleep 3');
$process = $this->getProcess('php -r "sleep(3);"');
$process->setTimeout(10);
$process->setIdleTimeout(0.5);
@ -632,7 +637,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
*/
public function testIdleTimeoutNotExceededWhenOutputIsSent()
{
$process = $this->getProcess('echo "foo" && sleep 1 && echo "foo" && sleep 1 && echo "foo" && sleep 1');
$process = $this->getProcess('php -r "echo \'foo\'; sleep(1); echo \'foo\'; sleep(1); echo \'foo\'; sleep(1); "');
$process->setTimeout(2);
$process->setIdleTimeout(1.5);

6
src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
View File

@ -51,11 +51,11 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
/**
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
* @expectedExceptionMessage his PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.
* @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
*/
public function testMustRun()
public function testSuccessfulMustRunHasCorrectExitCode()
{
parent::testMustRun();
parent::testSuccessfulMustRunHasCorrectExitCode();
}
/**