Skip to content

Commit

Permalink
Rename BasicRuleEngine in SequentialRuleEngine
Browse files Browse the repository at this point in the history
  • Loading branch information
romibuzi committed Mar 7, 2024
1 parent dde05a9 commit 2daca6e
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions src/Command/RunAWSCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use Majordome\Rule\AWS\UnusedElasticIP;
use Majordome\Rule\AWS\UnusedSecurityGroup;
use Majordome\Rule\AWS\UnusedSnapchot;
use Majordome\Rule\BasicRuleEngine;
use Majordome\Rule\SequentialRuleEngine;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
Expand Down Expand Up @@ -91,7 +91,7 @@ private function runMajordome(OutputInterface $output)
$awsCrawler->getELBResources()
);

$ruleEngine = new BasicRuleEngine();
$ruleEngine = new SequentialRuleEngine();
$rulesConfig = $this->application['aws.rules'];

if ($rulesConfig['DetachedEBS']) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Majordome\Resource\ResourceInterface;

class BasicRuleEngine implements RuleEngineInterface
class SequentialRuleEngine implements RuleEngineInterface
{
/** @var RuleInterface[] */
private $rules = [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace Majordome\Tests\Rule;

use Majordome\Rule\BasicRuleEngine;
use Majordome\Rule\SequentialRuleEngine;
use PHPUnit\Framework\TestCase;
use Prophecy\PhpUnit\ProphecyTrait;

class BasicRuleEngineTest extends TestCase
class SequentialRuleEngineTest extends TestCase
{
use ProphecyTrait;

Expand All @@ -18,11 +18,11 @@ public function testAddRules()
$rule2 = $this->prophesize();
$rule2->willImplement('Majordome\Rule\RuleInterface');

$basicRuleEngine = new BasicRuleEngine();
$basicRuleEngine->addRule($rule1->reveal());
$basicRuleEngine->addRule($rule2->reveal());
$sequentialRuleEngine = new SequentialRuleEngine();
$sequentialRuleEngine->addRule($rule1->reveal());
$sequentialRuleEngine->addRule($rule2->reveal());

$rules = $basicRuleEngine->getRules();
$rules = $sequentialRuleEngine->getRules();

$this->assertSame(2, count($rules));
$this->assertContains($rule1->reveal(), $rules);
Expand All @@ -48,11 +48,11 @@ public function testIsValid()
$rule1->isValid($resource->reveal())->willReturn(true)->shouldBeCalled();
$rule2->isValid($resource->reveal())->willReturn(true)->shouldBeCalled();

$basicRuleEngine = new BasicRuleEngine();
$basicRuleEngine->addRule($rule1->reveal());
$basicRuleEngine->addRule($rule2->reveal());
$sequentialRuleEngine = new SequentialRuleEngine();
$sequentialRuleEngine->addRule($rule1->reveal());
$sequentialRuleEngine->addRule($rule2->reveal());

$result = $basicRuleEngine->isValid($resource->reveal());
$result = $sequentialRuleEngine->isValid($resource->reveal());
$this->assertTrue($result);
}

Expand All @@ -72,13 +72,13 @@ public function testIsInvalid()
// rule2 shouldn't be executed, as rule1 already indicates the resource as invalid
$rule2->isValid($resource->reveal())->willReturn(true)->shouldNotBeCalled();

$basicRuleEngine = new BasicRuleEngine();
$basicRuleEngine->addRule($rule1->reveal());
$basicRuleEngine->addRule($rule2->reveal());
$sequentialRuleEngine = new SequentialRuleEngine();
$sequentialRuleEngine->addRule($rule1->reveal());
$sequentialRuleEngine->addRule($rule2->reveal());

$result = $basicRuleEngine->isValid($resource->reveal());
$result = $sequentialRuleEngine->isValid($resource->reveal());

$this->assertFalse($result);
$this->assertSame($rule1->reveal(), $basicRuleEngine->getInvalidatedRule());
$this->assertSame($rule1->reveal(), $sequentialRuleEngine->getInvalidatedRule());
}
}

0 comments on commit 2daca6e

Please sign in to comment.