diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php index 3f71593b53..1bb94e932b 100644 --- a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php +++ b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php @@ -88,18 +88,21 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase * * @dataProvider pipesCodeProvider */ - public function testProcessPipes($expected, $code) + public function testProcessPipes($code, $size) { if (defined('PHP_WINDOWS_VERSION_BUILD')) { $this->markTestSkipped('Test hangs on Windows & PHP due to https://bugs.php.net/bug.php?id=60120 and https://bugs.php.net/bug.php?id=51800'); } + $expected = str_repeat(str_repeat('*', 1024), $size) . '!'; + $expectedLength = (1024 * $size) + 1; + $p = $this->getProcess(sprintf('php -r %s', escapeshellarg($code))); $p->setStdin($expected); $p->run(); - $this->assertSame($expected, $p->getOutput()); - $this->assertSame($expected, $p->getErrorOutput()); + $this->assertEquals($expectedLength, strlen($p->getOutput())); + $this->assertEquals($expectedLength, strlen($p->getErrorOutput())); } public function chainedCommandsOutputProvider() @@ -338,13 +341,11 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase 'fwrite(STDOUT, $in = file_get_contents(\'php://stdin\')); fwrite(STDERR, $in);', 'include \'' . __DIR__ . '/ProcessTestHelper.php\';', ); - $baseData = str_repeat('*', 1024); $codes = array(); foreach (array(1, 16, 64, 1024, 4096) as $size) { - $data = str_repeat($baseData, $size) . '!'; foreach ($variations as $code) { - $codes[] = array($data, $code); + $codes[] = array($code, $size); } } diff --git a/src/Symfony/Component/Process/Tests/PhpProcessTest.php b/src/Symfony/Component/Process/Tests/PhpProcessTest.php index 02b629450b..df66ad624b 100644 --- a/src/Symfony/Component/Process/Tests/PhpProcessTest.php +++ b/src/Symfony/Component/Process/Tests/PhpProcessTest.php @@ -15,7 +15,6 @@ use Symfony\Component\Process\PhpProcess; class PhpProcessTest extends \PHPUnit_Framework_TestCase { - public function testNonBlockingWorks() { $expected = 'hello world!'; diff --git a/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php b/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php index 9ca45a80a7..e55efe0be5 100644 --- a/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php +++ b/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php @@ -15,10 +15,7 @@ use Symfony\Component\Process\ProcessBuilder; class ProcessBuilderTest extends \PHPUnit_Framework_TestCase { - /** - * @test - */ - public function shouldInheritEnvironmentVars() + public function testInheritEnvironmentVars() { $snapshot = $_ENV; $_ENV = $expected = array('foo' => 'bar'); @@ -32,10 +29,7 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase $_ENV = $snapshot; } - /** - * @test - */ - public function shouldInheritAndOverrideEnvironmentVars() + public function testProcessShouldInheritAndOverrideEnvironmentVars() { $snapshot = $_ENV; $_ENV = array('foo' => 'bar', 'bar' => 'baz'); @@ -51,10 +45,7 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase $_ENV = $snapshot; } - /** - * @test - */ - public function shouldInheritEnvironmentVarsByDefault() + public function testInheritEnvironmentVarsByDefault() { $pb = new ProcessBuilder(); $proc = $pb->add('foo')->getProcess(); @@ -62,10 +53,7 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase $this->assertNull($proc->getEnv()); } - /** - * @test - */ - public function shouldNotReplaceExplicitlySetVars() + public function testNotReplaceExplicitlySetVars() { $snapshot = $_ENV; $_ENV = array('foo' => 'bar'); diff --git a/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php b/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php index 356c7debaa..c626ddd982 100644 --- a/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php +++ b/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php @@ -37,7 +37,8 @@ class ProcessFailedExceptionTest extends \PHPUnit_Framework_TestCase '\InvalidArgumentException', 'Expected a failed process, but the given process was successful.' ); - $exception = new ProcessFailedException($process); + + new ProcessFailedException($process); } /** diff --git a/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php b/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php index 67fc0025bd..1e4dc1d0a2 100644 --- a/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php +++ b/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php @@ -14,7 +14,7 @@ namespace Symfony\Component\Process\Tests; class SigchildDisabledProcessTest extends AbstractProcessTest { /** - * @expectedException Symfony\Component\Process\Exception\RuntimeException + * @expectedException \Symfony\Component\Process\Exception\RuntimeException */ public function testGetExitCode() { @@ -22,7 +22,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest } /** - * @expectedException Symfony\Component\Process\Exception\RuntimeException + * @expectedException \Symfony\Component\Process\Exception\RuntimeException */ public function testExitCodeCommandFailed() { @@ -30,7 +30,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest } /** - * @expectedException Symfony\Component\Process\Exception\RuntimeException + * @expectedException \Symfony\Component\Process\Exception\RuntimeException */ public function testProcessIsSignaledIfStopped() { @@ -38,7 +38,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest } /** - * @expectedException Symfony\Component\Process\Exception\RuntimeException + * @expectedException \Symfony\Component\Process\Exception\RuntimeException */ public function testProcessWithTermSignal() { @@ -46,7 +46,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest } /** - * @expectedException Symfony\Component\Process\Exception\RuntimeException + * @expectedException \Symfony\Component\Process\Exception\RuntimeException */ public function testProcessIsNotSignaled() { @@ -54,7 +54,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest } /** - * @expectedException Symfony\Component\Process\Exception\RuntimeException + * @expectedException \Symfony\Component\Process\Exception\RuntimeException */ public function testProcessWithoutTermSignal() { @@ -62,7 +62,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest } /** - * @expectedException Symfony\Component\Process\Exception\RuntimeException + * @expectedException \Symfony\Component\Process\Exception\RuntimeException */ public function testExitCodeText() { @@ -73,7 +73,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest } /** - * @expectedException Symfony\Component\Process\Exception\RuntimeException + * @expectedException \Symfony\Component\Process\Exception\RuntimeException */ public function testIsSuccessful() { @@ -81,7 +81,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest } /** - * @expectedException Symfony\Component\Process\Exception\RuntimeException + * @expectedException \Symfony\Component\Process\Exception\RuntimeException */ public function testIsNotSuccessful() { diff --git a/src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php b/src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php index fb9b6f8cc8..5c664e2423 100644 --- a/src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php +++ b/src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php @@ -14,7 +14,7 @@ namespace Symfony\Component\Process\Tests; class SigchildEnabledProcessTest extends AbstractProcessTest { /** - * @expectedException Symfony\Component\Process\Exception\RuntimeException + * @expectedException \Symfony\Component\Process\Exception\RuntimeException */ public function testProcessIsSignaledIfStopped() { @@ -22,7 +22,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest } /** - * @expectedException Symfony\Component\Process\Exception\RuntimeException + * @expectedException \Symfony\Component\Process\Exception\RuntimeException */ public function testProcessWithTermSignal() { @@ -30,7 +30,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest } /** - * @expectedException Symfony\Component\Process\Exception\RuntimeException + * @expectedException \Symfony\Component\Process\Exception\RuntimeException */ public function testProcessIsNotSignaled() { @@ -38,7 +38,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest } /** - * @expectedException Symfony\Component\Process\Exception\RuntimeException + * @expectedException \Symfony\Component\Process\Exception\RuntimeException */ public function testProcessWithoutTermSignal() {