public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Test fixes

pull/1605/head
Jordi Boggiano 2013-02-20 16:50:26 +01:00
parent 3ca22f9ef1
commit b4c2347b24
2 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
View File

@ -34,9 +34,9 @@ class AutoloadGeneratorTest extends TestCase
$this->fs = new Filesystem; $this->fs = new Filesystem;
$that = $this; $that = $this;
$this->workingDir = realpath(sys_get_temp_dir()).DIRECTORY_SEPARATOR.'cmptest'; $this->workingDir = realpath(sys_get_temp_dir()).DIRECTORY_SEPARATOR.'cmptest-'.md5(uniqid('', true));
$this->fs->ensureDirectoryExists($this->workingDir); $this->fs->ensureDirectoryExists($this->workingDir);
$this->vendorDir = $this->workingDir.DIRECTORY_SEPARATOR.'composer-test-autoload-'.md5(uniqid('', true)); $this->vendorDir = $this->workingDir.DIRECTORY_SEPARATOR.'composer-test-autoload';
$this->ensureDirectoryExistsAndClear($this->vendorDir); $this->ensureDirectoryExistsAndClear($this->vendorDir);
$this->config = $this->getMock('Composer\Config'); $this->config = $this->getMock('Composer\Config');
@ -55,7 +55,7 @@ class AutoloadGeneratorTest extends TestCase
return $that->vendorDir; return $that->vendorDir;
})); }));
$this->dir = getcwd(); $this->origDir = getcwd();
chdir($this->workingDir); chdir($this->workingDir);
$this->im = $this->getMockBuilder('Composer\Installer\InstallationManager') $this->im = $this->getMockBuilder('Composer\Installer\InstallationManager')
@ -74,7 +74,7 @@ class AutoloadGeneratorTest extends TestCase
protected function tearDown() protected function tearDown()
{ {
chdir($this->dir); chdir($this->origDir);
if (is_dir($this->workingDir)) { if (is_dir($this->workingDir)) {
$this->fs->removeDirectory($this->workingDir); $this->fs->removeDirectory($this->workingDir);

49
tests/Composer/Test/Util/SvnTest.php
View File

@ -4,22 +4,8 @@ namespace Composer\Test\Util;
use Composer\IO\NullIO; use Composer\IO\NullIO;
use Composer\Util\Svn; use Composer\Util\Svn;
class SvnTest class SvnTest extends \PHPUnit_Framework_TestCase
{ {
/**
* Provide some examples for {@self::testCredentials()}.
*
* @return array
*/
public function urlProvider()
{
return array(
array('http://till:test@svn.example.org/', $this->getCmd(" --no-auth-cache --username 'till' --password 'test' ")),
array('http://svn.apache.org/', ''),
array('svn://johndoe@example.org', $this->getCmd(" --no-auth-cache --username 'johndoe' --password '' ")),
);
}
/** /**
* Test the credential string. * Test the credential string.
* *
@ -31,8 +17,24 @@ class SvnTest
public function testCredentials($url, $expect) public function testCredentials($url, $expect)
{ {
$svn = new Svn($url, new NullIO); $svn = new Svn($url, new NullIO);
$reflMethod = new \ReflectionMethod('Composer\\Util\\Svn', 'getCredentialString');
$reflMethod->setAccessible(true);
$this->assertEquals($expect, $svn->getCredentialString()); $this->assertEquals($expect, $reflMethod->invoke($svn));
}
/**
* Provide some examples for {@self::testCredentials()}.
*
* @return array
*/
public function urlProvider()
{
return array(
array('http://till:test@svn.example.org/', $this->getCmd(" --username 'till' --password 'test' ")),
array('http://svn.apache.org/', ''),
array('svn://johndoe@example.org', $this->getCmd(" --username 'johndoe' --password '' ")),
);
} }
public function testInteractiveString() public function testInteractiveString()
@ -40,10 +42,21 @@ class SvnTest
$url = 'http://svn.example.org'; $url = 'http://svn.example.org';
$svn = new Svn($url, new NullIO()); $svn = new Svn($url, new NullIO());
$reflMethod = new \ReflectionMethod('Composer\\Util\\Svn', 'getCommand');
$reflMethod->setAccessible(true);
$this->assertEquals( $this->assertEquals(
"svn ls --non-interactive 'http://svn.example.org'", $this->getCmd("svn ls --non-interactive 'http://svn.example.org'"),
$svn->getCommand('svn ls', $url) $reflMethod->invokeArgs($svn, array('svn ls', $url))
); );
} }
private function getCmd($cmd)
{
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
return strtr($cmd, "'", '"');
}
return $cmd;
}
} }