deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed duplicate methods of CommandExecutor helper: executeCommand and buildAndExecuteCommand

Browse source
This commit is contained in:
Corpsee 2014-05-09 14:25:24 +07:00
parent 3a0e62657b
commit a42dc67fad
3 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PHPCI/Builder.php
View file

@ -242,7 +242,7 @@ class Builder implements LoggerAwareInterface
*/
public function executeCommand()
{
return $this->commandExecutor->buildAndExecuteCommand(func_get_args());
return $this->commandExecutor->executeCommand(func_get_args());
}
/**

12
PHPCI/Helper/CommandExecutor.php
View file

@ -51,22 +51,12 @@ class CommandExecutor
$this->rootDir = $rootDir;
}
/**
* Executes shell commands. Accepts multiple arguments the first
* is the template and everything else is inserted in. c.f. sprintf
* @return bool Indicates success
*/
public function executeCommand()
{
return $this->buildAndExecuteCommand(func_get_args());
}
/**
* Executes shell commands.
* @param array $args
* @return bool Indicates success
*/
public function buildAndExecuteCommand($args = array())
public function executeCommand($args = array())
{
$this->lastOutput = array();

10
Tests/PHPCI/Helper/CommandExecutorTest.php
View file

@ -21,28 +21,28 @@ class CommandExecutorTest extends ProphecyTestCase
public function testGetLastOutput_ReturnsOutputOfCommand()
{
$this->testedExecutor->buildAndExecuteCommand(array('echo "%s"', 'Hello World'));
$this->testedExecutor->executeCommand(array('echo "%s"', 'Hello World'));
$output = $this->testedExecutor->getLastOutput();
$this->assertEquals("Hello World", $output);
}
public function testGetLastOutput_ForgetsPreviousCommandOutput()
{
$this->testedExecutor->buildAndExecuteCommand(array('echo "%s"', 'Hello World'));
$this->testedExecutor->buildAndExecuteCommand(array('echo "%s"', 'Hello Tester'));
$this->testedExecutor->executeCommand(array('echo "%s"', 'Hello World'));
$this->testedExecutor->executeCommand(array('echo "%s"', 'Hello Tester'));
$output = $this->testedExecutor->getLastOutput();
$this->assertEquals("Hello Tester", $output);
}
public function testExecuteCommand_ReturnsTrueForValidCommands()
{
$returnValue = $this->testedExecutor->buildAndExecuteCommand(array('echo "%s"', 'Hello World'));
$returnValue = $this->testedExecutor->executeCommand(array('echo "%s"', 'Hello World'));
$this->assertTrue($returnValue);
}
public function testExecuteCommand_ReturnsFalseForInvalidCommands()
{
$returnValue = $this->testedExecutor->buildAndExecuteCommand(array('eerfdcvcho "%s" > /dev/null 2>&1', 'Hello World'));
$returnValue = $this->testedExecutor->executeCommand(array('eerfdcvcho "%s" > /dev/null 2>&1', 'Hello World'));
$this->assertFalse($returnValue);
}