From 9cbcda9ae6e783c473475f22e489dbe960006468 Mon Sep 17 00:00:00 2001 From: Rob Bast Date: Tue, 27 Sep 2016 18:03:14 +0200 Subject: [PATCH] add test that asserts pool priority matters also switch assertEquals for assertSame --- .../DependencyResolver/DefaultPolicyTest.php | 76 +++++++++++++------ 1 file changed, 54 insertions(+), 22 deletions(-) diff --git a/tests/Composer/Test/DependencyResolver/DefaultPolicyTest.php b/tests/Composer/Test/DependencyResolver/DefaultPolicyTest.php index d694813c6..a73139d54 100644 --- a/tests/Composer/Test/DependencyResolver/DefaultPolicyTest.php +++ b/tests/Composer/Test/DependencyResolver/DefaultPolicyTest.php @@ -23,10 +23,13 @@ use Composer\TestCase; class DefaultPolicyTest extends TestCase { + /** @var Pool */ protected $pool; + /** @var ArrayRepository */ protected $repo; + /** @var ArrayRepository */ protected $repoInstalled; - protected $request; + /** @var DefaultPolicy */ protected $policy; public function setUp() @@ -48,7 +51,7 @@ class DefaultPolicyTest extends TestCase $selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals); - $this->assertEquals($expected, $selected); + $this->assertSame($expected, $selected); } public function testSelectNewest() @@ -62,7 +65,7 @@ class DefaultPolicyTest extends TestCase $selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals); - $this->assertEquals($expected, $selected); + $this->assertSame($expected, $selected); } public function testSelectNewestPicksLatest() @@ -76,7 +79,7 @@ class DefaultPolicyTest extends TestCase $selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals); - $this->assertEquals($expected, $selected); + $this->assertSame($expected, $selected); } public function testSelectNewestPicksLatestStableWithPreferStable() @@ -91,7 +94,7 @@ class DefaultPolicyTest extends TestCase $policy = new DefaultPolicy(true); $selected = $policy->selectPreferredPackages($this->pool, array(), $literals); - $this->assertEquals($expected, $selected); + $this->assertSame($expected, $selected); } public function testSelectNewestWithDevPicksNonDev() @@ -105,7 +108,7 @@ class DefaultPolicyTest extends TestCase $selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals); - $this->assertEquals($expected, $selected); + $this->assertSame($expected, $selected); } public function testSelectNewestOverInstalled() @@ -120,18 +123,18 @@ class DefaultPolicyTest extends TestCase $selected = $this->policy->selectPreferredPackages($this->pool, $this->mapFromRepo($this->repoInstalled), $literals); - $this->assertEquals($expected, $selected); + $this->assertSame($expected, $selected); } public function testSelectFirstRepo() { - $this->repoImportant = new ArrayRepository; + $otherRepository = new ArrayRepository; $this->repo->addPackage($packageA = $this->getPackage('A', '1.0')); - $this->repoImportant->addPackage($packageAImportant = $this->getPackage('A', '1.0')); + $otherRepository->addPackage($packageAImportant = $this->getPackage('A', '1.0')); $this->pool->addRepository($this->repoInstalled); - $this->pool->addRepository($this->repoImportant); + $this->pool->addRepository($otherRepository); $this->pool->addRepository($this->repo); $literals = array($packageA->getId(), $packageAImportant->getId()); @@ -139,23 +142,52 @@ class DefaultPolicyTest extends TestCase $selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals); - $this->assertEquals($expected, $selected); + $this->assertSame($expected, $selected); + } + + public function testRepositoryOrderingAffectsPriority() + { + $repo1 = new ArrayRepository; + $repo2 = new ArrayRepository; + + $repo1->addPackage($package1 = $this->getPackage('A', '1.0')); + $repo1->addPackage($package2 = $this->getPackage('A', '1.1')); + $repo2->addPackage($package3 = $this->getPackage('A', '1.1')); + $repo2->addPackage($package4 = $this->getPackage('A', '1.2')); + + $this->pool->addRepository($repo1); + $this->pool->addRepository($repo2); + + $literals = array($package1->getId(), $package2->getId(), $package3->getId(), $package4->getId()); + $expected = array($package2->getId()); + $selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals); + + $this->assertSame($expected, $selected); + + $this->pool = new Pool('dev'); + $this->pool->addRepository($repo2); + $this->pool->addRepository($repo1); + + $expected = array($package4->getId()); + $selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals); + + $this->assertSame($expected, $selected); } public function testSelectLocalReposFirst() { - $this->repoImportant = new ArrayRepository; + $repoImportant = new ArrayRepository; $this->repo->addPackage($packageA = $this->getPackage('A', 'dev-master')); $this->repo->addPackage($packageAAlias = new AliasPackage($packageA, '2.1.9999999.9999999-dev', '2.1.x-dev')); - $this->repoImportant->addPackage($packageAImportant = $this->getPackage('A', 'dev-feature-a')); - $this->repoImportant->addPackage($packageAAliasImportant = new AliasPackage($packageAImportant, '2.1.9999999.9999999-dev', '2.1.x-dev')); - $this->repoImportant->addPackage($packageA2Important = $this->getPackage('A', 'dev-master')); - $this->repoImportant->addPackage($packageA2AliasImportant = new AliasPackage($packageA2Important, '2.1.9999999.9999999-dev', '2.1.x-dev')); + $repoImportant->addPackage($packageAImportant = $this->getPackage('A', 'dev-feature-a')); + $repoImportant->addPackage($packageAAliasImportant = new AliasPackage($packageAImportant, '2.1.9999999.9999999-dev', '2.1.x-dev')); + $repoImportant->addPackage($packageA2Important = $this->getPackage('A', 'dev-master')); + $repoImportant->addPackage($packageA2AliasImportant = new AliasPackage($packageA2Important, '2.1.9999999.9999999-dev', '2.1.x-dev')); $packageAAliasImportant->setRootPackageAlias(true); $this->pool->addRepository($this->repoInstalled); - $this->pool->addRepository($this->repoImportant); + $this->pool->addRepository($repoImportant); $this->pool->addRepository($this->repo); $packages = $this->pool->whatProvides('a', new Constraint('=', '2.1.9999999.9999999-dev')); @@ -168,7 +200,7 @@ class DefaultPolicyTest extends TestCase $selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals); - $this->assertEquals($expected, $selected); + $this->assertSame($expected, $selected); } public function testSelectAllProviders() @@ -186,7 +218,7 @@ class DefaultPolicyTest extends TestCase $selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals); - $this->assertEquals($expected, $selected); + $this->assertSame($expected, $selected); } public function testPreferNonReplacingFromSameRepo() @@ -203,7 +235,7 @@ class DefaultPolicyTest extends TestCase $selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals); - $this->assertEquals($expected, $selected); + $this->assertSame($expected, $selected); } public function testPreferReplacingPackageFromSameVendor() @@ -235,7 +267,7 @@ class DefaultPolicyTest extends TestCase $expected = $literals; $selected = $this->policy->selectPreferredPackages($this->pool, array(), $literals, 'vendor-a/package'); - $this->assertEquals($expected, $selected); + $this->assertSame($expected, $selected); } protected function mapFromRepo(RepositoryInterface $repo) @@ -261,6 +293,6 @@ class DefaultPolicyTest extends TestCase $selected = $policy->selectPreferredPackages($this->pool, array(), $literals); - $this->assertEquals($expected, $selected); + $this->assertSame($expected, $selected); } }