public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 00:22:53 +00:00
Code Activity

Revert "Merge remote-tracking branch 'naderman/remove-packages-by-default'"

Browse source 
This reverts commit 2988152602, reversing
changes made to adb4188e12.
This commit is contained in:
Jordi Boggiano 2012-04-29 22:21:58 +02:00
parent a4c2337433
commit f7440076fa
9 changed files with 584 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/Composer/Test/DependencyResolver/RuleSetTest.php
View file

@ -27,15 +27,17 @@ class RuleSetTest extends TestCase
new Rule(array(), 'job1', null),
new Rule(array(), 'job2', null),
),
RuleSet::TYPE_LEARNED => array(
RuleSet::TYPE_FEATURE => array(
new Rule(array(), 'update1', null),
),
RuleSet::TYPE_LEARNED => array(),
RuleSet::TYPE_CHOICE => array(),
);
$ruleSet = new RuleSet;
$ruleSet->add($rules[RuleSet::TYPE_JOB][0], RuleSet::TYPE_JOB);
$ruleSet->add($rules[RuleSet::TYPE_LEARNED][0], RuleSet::TYPE_LEARNED);
$ruleSet->add($rules[RuleSet::TYPE_FEATURE][0], RuleSet::TYPE_FEATURE);
$ruleSet->add($rules[RuleSet::TYPE_JOB][1], RuleSet::TYPE_JOB);
$this->assertEquals($rules, $ruleSet->getRules());
@ -78,7 +80,7 @@ class RuleSetTest extends TestCase
$rule1 = new Rule(array(), 'job1', null);
$rule2 = new Rule(array(), 'job1', null);
$ruleSet->add($rule1, RuleSet::TYPE_JOB);
$ruleSet->add($rule2, RuleSet::TYPE_LEARNED);
$ruleSet->add($rule2, RuleSet::TYPE_FEATURE);
$iterator = $ruleSet->getIterator();
@ -94,9 +96,9 @@ class RuleSetTest extends TestCase
$rule2 = new Rule(array(), 'job1', null);
$ruleSet->add($rule1, RuleSet::TYPE_JOB);
$ruleSet->add($rule2, RuleSet::TYPE_LEARNED);
$ruleSet->add($rule2, RuleSet::TYPE_FEATURE);
$iterator = $ruleSet->getIteratorFor(RuleSet::TYPE_LEARNED);
$iterator = $ruleSet->getIteratorFor(RuleSet::TYPE_FEATURE);
$this->assertSame($rule2, $iterator->current());
}
@ -108,7 +110,7 @@ class RuleSetTest extends TestCase
$rule2 = new Rule(array(), 'job1', null);
$ruleSet->add($rule1, RuleSet::TYPE_JOB);
$ruleSet->add($rule2, RuleSet::TYPE_LEARNED);
$ruleSet->add($rule2, RuleSet::TYPE_FEATURE);
$iterator = $ruleSet->getIteratorWithout(RuleSet::TYPE_JOB);
@ -140,7 +142,7 @@ class RuleSetTest extends TestCase
->method('equal')
->will($this->returnValue(false));
$ruleSet->add($rule, RuleSet::TYPE_LEARNED);
$ruleSet->add($rule, RuleSet::TYPE_FEATURE);
$this->assertTrue($ruleSet->containsEqual($rule));
$this->assertFalse($ruleSet->containsEqual($rule2));
@ -153,9 +155,9 @@ class RuleSetTest extends TestCase
$literal = new Literal($this->getPackage('foo', '2.1'), true);
$rule = new Rule(array($literal), 'job1', null);
$ruleSet->add($rule, RuleSet::TYPE_JOB);
$ruleSet->add($rule, RuleSet::TYPE_FEATURE);
$this->assertContains('JOB : (+foo-2.1.0.0)', $ruleSet->__toString());
$this->assertContains('FEATURE : (+foo-2.1.0.0)', $ruleSet->__toString());
}
private function getRuleMock()