From ae7107fc223b0d82327d54c23241c4127a03fb39 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sat, 18 Feb 2012 19:00:40 +0100 Subject: [PATCH] Add more test requirements --- .../Test/Package/Version/VersionParserTest.php | 7 ++++--- tests/Composer/Test/Repository/VcsRepositoryTest.php | 12 ++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/Composer/Test/Package/Version/VersionParserTest.php b/tests/Composer/Test/Package/Version/VersionParserTest.php index 74e787bde..64a3e79f4 100644 --- a/tests/Composer/Test/Package/Version/VersionParserTest.php +++ b/tests/Composer/Test/Package/Version/VersionParserTest.php @@ -52,7 +52,7 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase 'parses master' => array('dev-master', '9999999-dev'), 'parses trunk' => array('dev-trunk', '9999999-dev'), 'parses arbitrary' => array('dev-feature-foo', 'dev-feature-foo'), - 'parses arbitrary2' => array('dev-foobar', 'dev-foobar'), + 'parses arbitrary2' => array('DEV-FOOBAR', 'dev-foobar'), ); } @@ -125,8 +125,9 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase 'no op means eq' => array('1.2.3', new VersionConstraint('=', '1.2.3.0')), 'completes version' => array('=1.0', new VersionConstraint('=', '1.0.0.0')), 'accepts spaces' => array('>= 1.2.3', new VersionConstraint('>=', '1.2.3.0')), - 'accepts master' => array('>=master-dev', new VersionConstraint('>=', '9999999-dev')), - 'accepts master/2' => array('master-dev', new VersionConstraint('=', '9999999-dev')), + 'accepts master' => array('>=dev-master', new VersionConstraint('>=', '9999999-dev')), + 'accepts master/2' => array('dev-master', new VersionConstraint('=', '9999999-dev')), + 'accepts arbitrary' => array('dev-feature-a', new VersionConstraint('=', 'dev-feature-a')), ); } diff --git a/tests/Composer/Test/Repository/VcsRepositoryTest.php b/tests/Composer/Test/Repository/VcsRepositoryTest.php index 0071d3f7d..4ea24725b 100644 --- a/tests/Composer/Test/Repository/VcsRepositoryTest.php +++ b/tests/Composer/Test/Repository/VcsRepositoryTest.php @@ -86,6 +86,9 @@ class VcsRepositoryTest extends \PHPUnit_Framework_TestCase $process->execute('git checkout master', $null); $process->execute('git branch 1.0', $null); + // add 1.0.x branch + $process->execute('git branch 1.0.x', $null); + // update master to 2.0 $composer['version'] = '2.0.0'; file_put_contents('composer.json', json_encode($composer)); @@ -112,8 +115,9 @@ class VcsRepositoryTest extends \PHPUnit_Framework_TestCase { $expected = array( '0.6.0' => true, - '0.9.0' => true, '1.0.0' => true, + '1.0-dev' => true, + '1.0.x-dev' => true, 'dev-feature-b' => true, 'dev-feature-a' => true, 'dev-master' => true, @@ -131,10 +135,6 @@ class VcsRepositoryTest extends \PHPUnit_Framework_TestCase } } - if ($expected) { - $this->fail('Missing versions: '.implode(', ', $expected)); - } - - $this->pass(); + $this->assertEmpty($expected, 'Missing versions: '.implode(', ', array_keys($expected))); } }