deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Repaired tests + refactored code for tests

Browse source
This commit is contained in:
Dmitry Khomutov 2016-08-11 21:32:42 +07:00
commit 9de4fb51d3
37 changed files with 409 additions and 1125 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/PHPCensor/ProcessControl/ProcessControlTest.php
View file

@ -7,7 +7,7 @@ namespace Tests\PHPCensor\ProcessControl;
abstract class ProcessControlTest extends \PHPUnit_Framework_TestCase
{
/**
* @var type
* @var resource
*/
protected $process;
@ -31,13 +31,13 @@ abstract class ProcessControlTest extends \PHPUnit_Framework_TestCase
$this->pipes = [];
$this->process = proc_open($this->getTestCommand(), $desc, $this->pipes);
usleep(500);
sleep(1);
$this->assertTrue(is_resource($this->process));
$this->assertTrue($this->isRunning());
$status = proc_get_status($this->process);
return $status['pid'];
return (integer)$status['pid'];
}
/** End the running process.
@ -65,7 +65,7 @@ abstract class ProcessControlTest extends \PHPUnit_Framework_TestCase
return false;
}
$status = proc_get_status($this->process);
return $status['running'];
return (boolean)$status['running'];
}
public function testIsRunning()
@ -94,10 +94,10 @@ abstract class ProcessControlTest extends \PHPUnit_Framework_TestCase
$pid = $this->startProcess();
$this->object->kill($pid);
usleep(500);
self::assertTrue($this->object->kill($pid));
sleep(1);
$this->assertFalse($this->isRunning());
self::assertFalse($this->isRunning());
}
public function testForcefullyKill()
@ -109,9 +109,9 @@ abstract class ProcessControlTest extends \PHPUnit_Framework_TestCase
$pid = $this->startProcess();
$this->object->kill($pid, true);
usleep(500);
sleep(1);
$this->assertFalse($this->isRunning());
self::assertFalse($this->isRunning());
}
abstract public function testIsAvailable();

2
tests/PHPCensor/ProcessControl/WindowsProcessControlTest.php
View file

@ -7,7 +7,7 @@ class WindowsProcessControlTest extends ProcessControlTest
{
protected function setUp()
{
$this->object = new WindowsProcessControl;
$this->object = new WindowsProcessControl();
}
public function getTestCommand()