mirror of
https://github.com/composer/composer
synced 2025-05-09 08:32:56 +00:00
almost all unit tests passing after IOInterface dependency refactor. no longer passing IOInterface into any Perforce methods
This commit is contained in:
parent
0f7b078d6c
commit
24dd42267f
6 changed files with 239 additions and 229 deletions
|
@ -24,26 +24,44 @@ class PerforceTest extends \PHPUnit_Framework_TestCase
|
|||
protected $processExecutor;
|
||||
protected $io;
|
||||
|
||||
const TEST_DEPOT = 'depot';
|
||||
const TEST_BRANCH = 'branch';
|
||||
const TEST_P4USER = 'user';
|
||||
const TEST_CLIENT_NAME = 'TEST';
|
||||
const TEST_PORT = 'port';
|
||||
const TEST_PATH = 'path';
|
||||
|
||||
public function setUp()
|
||||
{
|
||||
$this->processExecutor = $this->getMock('Composer\Util\ProcessExecutor');
|
||||
$repoConfig = array(
|
||||
'depot' => 'depot',
|
||||
'branch' => 'branch',
|
||||
'p4user' => 'user',
|
||||
'unique_perforce_client_name' => 'TEST'
|
||||
);
|
||||
$io = $this->getMock('Composer\IO\IOInterface');
|
||||
$this->perforce = new Perforce($repoConfig, 'port', 'path', $this->processExecutor, true, $io);
|
||||
$this->repoConfig = $this->getTestRepoConfig();
|
||||
$this->io = $this->getMockIOInterface();
|
||||
$this->perforce = new Perforce($this->repoConfig, self::TEST_PORT, self::TEST_PATH, $this->processExecutor, true, $this->io);
|
||||
}
|
||||
|
||||
public function tearDown()
|
||||
{
|
||||
$this->perforce = null;
|
||||
$this->io = null;
|
||||
$this->perforce = null;
|
||||
$this->io = null;
|
||||
$this->repoConfig = null;
|
||||
$this->processExecutor = null;
|
||||
}
|
||||
|
||||
public function getTestRepoConfig()
|
||||
{
|
||||
return array(
|
||||
'depot' => self::TEST_DEPOT,
|
||||
'branch' => self::TEST_BRANCH,
|
||||
'p4user' => self::TEST_P4USER,
|
||||
'unique_perforce_client_name' => self::TEST_CLIENT_NAME
|
||||
);
|
||||
}
|
||||
|
||||
public function getMockIOInterface()
|
||||
{
|
||||
return $this->getMock('Composer\IO\IOInterface');
|
||||
}
|
||||
|
||||
public function testGetClientWithoutStream()
|
||||
{
|
||||
$client = $this->perforce->getClient();
|
||||
|
@ -107,116 +125,90 @@ class PerforceTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
public function testQueryP4UserWithUserAlreadySet()
|
||||
{
|
||||
$io = $this->getMock('Composer\IO\IOInterface');
|
||||
|
||||
$repoConfig = array('depot' => 'depot', 'branch' => 'branch', 'p4user' => 'TEST_USER');
|
||||
$this->perforce = new Perforce($repoConfig, 'port', 'path', $this->processExecutor, true, 'TEST');
|
||||
|
||||
$this->perforce->queryP4user($io);
|
||||
$this->assertEquals('TEST_USER', $this->perforce->getUser());
|
||||
$this->perforce->queryP4user();
|
||||
$this->assertEquals(self::TEST_P4USER, $this->perforce->getUser());
|
||||
}
|
||||
|
||||
public function testQueryP4UserWithUserSetInP4VariablesWithWindowsOS()
|
||||
{
|
||||
$repoConfig = array('depot' => 'depot', 'branch' => 'branch');
|
||||
$this->perforce = new Perforce($repoConfig, 'port', 'path', $this->processExecutor, true, 'TEST');
|
||||
|
||||
$io = $this->getMock('Composer\IO\IOInterface');
|
||||
$this->perforce->setUser(null);
|
||||
$this->perforce->setWindowsFlag(true);
|
||||
$expectedCommand = 'p4 set';
|
||||
$callback = function($command, &$output)
|
||||
{
|
||||
$output = 'P4USER=TEST_P4VARIABLE_USER' . PHP_EOL;
|
||||
return true;
|
||||
};
|
||||
$this->processExecutor->expects($this->at(0))
|
||||
->method('execute')
|
||||
->with($this->equalTo($expectedCommand))
|
||||
->will(
|
||||
$this->returnCallback(
|
||||
function ($command, &$output) {
|
||||
$output = 'P4USER=TEST_P4VARIABLE_USER' . PHP_EOL ;
|
||||
|
||||
return true;
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
$this->perforce->queryP4user($io);
|
||||
->method('execute')
|
||||
->with($this->equalTo($expectedCommand))
|
||||
->will($this->returnCallback($callback));
|
||||
$this->perforce->queryP4user();
|
||||
$this->assertEquals('TEST_P4VARIABLE_USER', $this->perforce->getUser());
|
||||
}
|
||||
|
||||
public function testQueryP4UserWithUserSetInP4VariablesNotWindowsOS()
|
||||
{
|
||||
$repoConfig = array('depot' => 'depot', 'branch' => 'branch');
|
||||
$this->perforce = new Perforce($repoConfig, 'port', 'path', $this->processExecutor, false, 'TEST');
|
||||
|
||||
$io = $this->getMock('Composer\IO\IOInterface');
|
||||
$this->perforce->setUser(null);
|
||||
$this->perforce->setWindowsFlag(false);
|
||||
$expectedCommand = 'echo $P4USER';
|
||||
$callback = function($command, &$output)
|
||||
{
|
||||
$output = 'TEST_P4VARIABLE_USER' . PHP_EOL;
|
||||
return true;
|
||||
};
|
||||
$this->processExecutor->expects($this->at(0))
|
||||
->method('execute')
|
||||
->with($this->equalTo($expectedCommand))
|
||||
->will(
|
||||
$this->returnCallback(
|
||||
function ($command, &$output) {
|
||||
$output = 'TEST_P4VARIABLE_USER' . PHP_EOL;
|
||||
|
||||
return true;
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
$this->perforce->queryP4user($io);
|
||||
->method('execute')
|
||||
->with($this->equalTo($expectedCommand))
|
||||
->will($this->returnCallback($callback));
|
||||
$this->perforce->queryP4user();
|
||||
$this->assertEquals('TEST_P4VARIABLE_USER', $this->perforce->getUser());
|
||||
}
|
||||
|
||||
public function testQueryP4UserQueriesForUser()
|
||||
{
|
||||
$repoConfig = array('depot' => 'depot', 'branch' => 'branch');
|
||||
$this->perforce = new Perforce($repoConfig, 'port', 'path', $this->processExecutor, false, 'TEST');
|
||||
$io = $this->getMock('Composer\IO\IOInterface');
|
||||
$this->perforce->setUser(null);
|
||||
$expectedQuestion = 'Enter P4 User:';
|
||||
$io->expects($this->at(0))
|
||||
->method('ask')
|
||||
->with($this->equalTo($expectedQuestion))
|
||||
->will($this->returnValue('TEST_QUERY_USER'));
|
||||
|
||||
$this->perforce->queryP4user($io);
|
||||
$this->io->expects($this->at(0))
|
||||
->method('ask')
|
||||
->with($this->equalTo($expectedQuestion))
|
||||
->will($this->returnValue('TEST_QUERY_USER'));
|
||||
$this->perforce->queryP4user();
|
||||
$this->assertEquals('TEST_QUERY_USER', $this->perforce->getUser());
|
||||
}
|
||||
|
||||
public function testQueryP4UserStoresResponseToQueryForUserWithWindows()
|
||||
{
|
||||
$repoConfig = array('depot' => 'depot', 'branch' => 'branch');
|
||||
$this->perforce = new Perforce($repoConfig, 'port', 'path', $this->processExecutor, true, 'TEST');
|
||||
|
||||
$io = $this->getMock('Composer\IO\IOInterface');
|
||||
$this->perforce->setUser(null);
|
||||
$this->perforce->setWindowsFlag(true);
|
||||
$expectedQuestion = 'Enter P4 User:';
|
||||
$io->expects($this->at(0))
|
||||
->method('ask')
|
||||
->with($this->equalTo($expectedQuestion))
|
||||
->will($this->returnValue('TEST_QUERY_USER'));
|
||||
$expectedCommand = 'p4 set P4USER=TEST_QUERY_USER';
|
||||
$expectedCommand = 'p4 set P4USER=TEST_QUERY_USER';
|
||||
$this->io->expects($this->at(0))
|
||||
->method('ask')
|
||||
->with($this->equalTo($expectedQuestion))
|
||||
->will($this->returnValue('TEST_QUERY_USER'));
|
||||
$this->processExecutor->expects($this->at(1))
|
||||
->method('execute')
|
||||
->with($this->equalTo($expectedCommand))
|
||||
->will($this->returnValue(0));
|
||||
|
||||
$this->perforce->queryP4user($io);
|
||||
->method('execute')
|
||||
->with($this->equalTo($expectedCommand))
|
||||
->will($this->returnValue(0));
|
||||
$this->perforce->queryP4user();
|
||||
}
|
||||
|
||||
public function testQueryP4UserStoresResponseToQueryForUserWithoutWindows()
|
||||
{
|
||||
$repoConfig = array('depot' => 'depot', 'branch' => 'branch');
|
||||
$this->perforce = new Perforce($repoConfig, 'port', 'path', $this->processExecutor, false, 'TEST');
|
||||
|
||||
$io = $this->getMock('Composer\IO\IOInterface');
|
||||
$this->perforce->setUser(null);
|
||||
$this->perforce->setWindowsFlag(false);
|
||||
$expectedQuestion = 'Enter P4 User:';
|
||||
$io->expects($this->at(0))
|
||||
->method('ask')
|
||||
->with($this->equalTo($expectedQuestion))
|
||||
->will($this->returnValue('TEST_QUERY_USER'));
|
||||
$expectedCommand = 'export P4USER=TEST_QUERY_USER';
|
||||
$expectedCommand = 'export P4USER=TEST_QUERY_USER';
|
||||
$this->io->expects($this->at(0))
|
||||
->method('ask')
|
||||
->with($this->equalTo($expectedQuestion))
|
||||
->will($this->returnValue('TEST_QUERY_USER'));
|
||||
$this->processExecutor->expects($this->at(1))
|
||||
->method('execute')
|
||||
->with($this->equalTo($expectedCommand))
|
||||
->will($this->returnValue(0));
|
||||
|
||||
$this->perforce->queryP4user($io);
|
||||
->method('execute')
|
||||
->with($this->equalTo($expectedCommand))
|
||||
->will($this->returnValue(0));
|
||||
$this->perforce->queryP4user();
|
||||
}
|
||||
|
||||
public function testQueryP4PasswordWithPasswordAlreadySet()
|
||||
|
@ -227,69 +219,55 @@ class PerforceTest extends \PHPUnit_Framework_TestCase
|
|||
'p4user' => 'user',
|
||||
'p4password' => 'TEST_PASSWORD'
|
||||
);
|
||||
$this->perforce = new Perforce($repoConfig, 'port', 'path', $this->processExecutor, false, 'TEST');
|
||||
$io = $this->getMock('Composer\IO\IOInterface');
|
||||
|
||||
$password = $this->perforce->queryP4Password($io);
|
||||
$this->perforce = new Perforce($repoConfig, 'port', 'path', $this->processExecutor, false, $this->getMockIOInterface(), 'TEST');
|
||||
$password = $this->perforce->queryP4Password();
|
||||
$this->assertEquals('TEST_PASSWORD', $password);
|
||||
}
|
||||
|
||||
public function testQueryP4PasswordWithPasswordSetInP4VariablesWithWindowsOS()
|
||||
{
|
||||
$io = $this->getMock('Composer\IO\IOInterface');
|
||||
|
||||
$this->perforce->setWindowsFlag(true);
|
||||
$expectedCommand = 'p4 set';
|
||||
$callback = function($command, &$output)
|
||||
{
|
||||
$output = 'P4PASSWD=TEST_P4VARIABLE_PASSWORD' . PHP_EOL;
|
||||
return true;
|
||||
};
|
||||
$this->processExecutor->expects($this->at(0))
|
||||
->method('execute')
|
||||
->with($this->equalTo($expectedCommand))
|
||||
->will(
|
||||
$this->returnCallback(
|
||||
function ($command, &$output) {
|
||||
$output = 'P4PASSWD=TEST_P4VARIABLE_PASSWORD' . PHP_EOL;
|
||||
|
||||
return true;
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
$password = $this->perforce->queryP4Password($io);
|
||||
->method('execute')
|
||||
->with($this->equalTo($expectedCommand))
|
||||
->will($this->returnCallback($callback));
|
||||
$password = $this->perforce->queryP4Password();
|
||||
$this->assertEquals('TEST_P4VARIABLE_PASSWORD', $password);
|
||||
}
|
||||
|
||||
public function testQueryP4PasswordWithPasswordSetInP4VariablesNotWindowsOS()
|
||||
{
|
||||
$repoConfig = array('depot' => 'depot', 'branch' => 'branch', 'p4user' => 'user');
|
||||
$this->perforce = new Perforce($repoConfig, 'port', 'path', $this->processExecutor, false, 'TEST');
|
||||
|
||||
$io = $this->getMock('Composer\IO\IOInterface');
|
||||
$this->perforce->setWindowsFlag(false);
|
||||
$expectedCommand = 'echo $P4PASSWD';
|
||||
$callback = function($command, &$output)
|
||||
{
|
||||
$output = 'TEST_P4VARIABLE_PASSWORD' . PHP_EOL;
|
||||
return true;
|
||||
};
|
||||
$this->processExecutor->expects($this->at(0))
|
||||
->method('execute')
|
||||
->with($this->equalTo($expectedCommand))
|
||||
->will(
|
||||
$this->returnCallback(
|
||||
function ($command, &$output) {
|
||||
$output = 'TEST_P4VARIABLE_PASSWORD' . PHP_EOL;
|
||||
->method('execute')
|
||||
->with($this->equalTo($expectedCommand))
|
||||
->will($this->returnCallback($callback));
|
||||
|
||||
return true;
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
$password = $this->perforce->queryP4Password($io);
|
||||
$password = $this->perforce->queryP4Password();
|
||||
$this->assertEquals('TEST_P4VARIABLE_PASSWORD', $password);
|
||||
}
|
||||
|
||||
public function testQueryP4PasswordQueriesForPassword()
|
||||
{
|
||||
$io = $this->getMock('Composer\IO\IOInterface');
|
||||
$expectedQuestion = 'Enter password for Perforce user user: ';
|
||||
$io->expects($this->at(0))
|
||||
$this->io->expects($this->at(0))
|
||||
->method('askAndHideAnswer')
|
||||
->with($this->equalTo($expectedQuestion))
|
||||
->will($this->returnValue('TEST_QUERY_PASSWORD'));
|
||||
|
||||
$password = $this->perforce->queryP4Password($io);
|
||||
$password = $this->perforce->queryP4Password();
|
||||
$this->assertEquals('TEST_QUERY_PASSWORD', $password);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue