From 61773dea68e2eb165f9278b4fb28036e671cd421 Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Fri, 28 Mar 2014 18:26:06 +0100 Subject: [PATCH 1/2] [Form] Fixed infinite tests when ICU is available --- .../Extension/Core/Type/DateTimeTypeTest.php | 16 ++++++++-------- .../Tests/Extension/Core/Type/DateTypeTest.php | 12 ++++++------ .../Tests/Extension/Core/Type/TimeTypeTest.php | 12 ++++++------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php index b9c1ebad38..c76039262d 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php @@ -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())); } } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php index 508ab410b0..e38bfe0ebb 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php @@ -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() diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php index 9bdfe1567b..3dc5cff438 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php @@ -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())); } /** From a42fbd7ade6d9b599d31fdb91d9a4670b07bb784 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Mon, 31 Mar 2014 09:31:57 +0200 Subject: [PATCH 2/2] [Process] Fix Process test suite --- .../Component/Process/Tests/AbstractProcessTest.php | 13 +++++++++---- .../Process/Tests/SigchildDisabledProcessTest.php | 6 +++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php index 9b6b3611da..4b2cf43e67 100644 --- a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php +++ b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php @@ -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); diff --git a/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php b/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php index 0f6bf52b71..252098ec4c 100644 --- a/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php +++ b/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php @@ -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(); } /**