Skip to content

Added tests for Httplug factory #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 3, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions HttplugFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ private function findOneByType($type)
* @param mixed $condition
*
* @return bool
*
* TODO: review this method
*/
protected function evaluateCondition($condition)
{
Expand All @@ -95,8 +93,8 @@ protected function evaluateCondition($condition)
$evaluatedCondition = true;

// Immediately stop execution if the condition is false
for ($i = 0; $i < count($condition) && false !== $evaluatedCondition; ++$i) {
$evaluatedCondition &= $this->evaluateCondition($condition[$i]);
while (count($condition) > 0 && $evaluatedCondition) {
$evaluatedCondition = $this->evaluateCondition(array_shift($condition));
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can not see any reson why we need &=

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because $evaluatedCondition is checked before the next loop and breaks it if false.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would not remove this as it is a wonderful solution for sparing that extra if you added.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will only "look nice". You will still do the same number of comparisons. The current solution does not support assoc. arrays.

Anyhow. I updated the PR so it gets the best of both worlds... What do you think?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same number of comparisons, but less branches IMO. LGTM.

return $evaluatedCondition;
Expand Down
123 changes: 123 additions & 0 deletions Tests/Unit/HttplugFactoryTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
<?php

namespace Http\HttplugBundle\Tests\Unit;

use Http\HttplugBundle\ClientFactory\DummyClient;
use Http\HttplugBundle\Collector\MessageJournal;
use Http\HttplugBundle\HttplugFactory;
use Puli\Discovery\Api\Discovery;
use Puli\Discovery\Binding\ClassBinding;
use Webmozart\Expression\Expr;

/**
* @author Tobias Nyholm <[email protected]>
*/
class HttplugFactoryTest extends \PHPUnit_Framework_TestCase
{
public function testEvaluateConditionString()
{
$existingClass = MessageJournal::class;
$factory = $this->getMockedFactory($existingClass);
$this->assertInstanceOf(DummyClient::class, $factory->find('type'));
}

/**
* @expectedException \RuntimeException
*/
public function testEvaluateConditionInvalidString()
{
// String
$factory = $this->getMockedFactory('non_existent_class');
$factory->find('type');
}

public function testEvaluateConditionCallableTrue()
{
$factory = $this->getMockedFactory(
function () {
return true;
}
);
$this->assertInstanceOf(DummyClient::class, $factory->find('type'));
}

/**
* @expectedException \RuntimeException
*/
public function testEvaluateConditionCallableFalse()
{
$factory = $this->getMockedFactory(
function () {
return false;
}
);

$factory->find('type');
}

public function testEvaluateConditionBooleanTrue()
{
$factory = $this->getMockedFactory(true);
$this->assertInstanceOf(DummyClient::class, $factory->find('type'));
}

/**
* @expectedException \RuntimeException
*/
public function testEvaluateConditionBooleanFalse()
{
$factory = $this->getMockedFactory(false);
$factory->find('type');
}

public function testEvaluateConditionArrayTrue()
{
$factory = $this->getMockedFactory([true, true]);
$this->assertInstanceOf(DummyClient::class, $factory->find('type'));
}

/**
* @expectedException \RuntimeException
*/
public function testEvaluateConditionArrayFalse()
{
$factory = $this->getMockedFactory([true, false, true]);
$factory->find('type');
}

public function testEvaluateConditionArrayAssoc()
{
$factory = $this->getMockedFactory(['test1' => true, true]);
$this->assertInstanceOf(DummyClient::class, $factory->find('type'));
}

/**
* @expectedException \RuntimeException
*/
public function testEvaluateConditionObject()
{
$factory = $this->getMockedFactory(new \DateTime());
$factory->find('type');
}

/**
* @param $condition
*
* @return HttplugFactory
*/
private function getMockedFactory($condition)
{
$discovery = $this->prophesize(Discovery::class);
$factory = new HttplugFactory($discovery->reveal());
$binding = $this->prophesize(ClassBinding::class);
$discovery->findBindings('type', Expr::isInstanceOf('Puli\Discovery\Binding\ClassBinding'))->willReturn(
[$binding->reveal()]
);

$binding->hasParameterValue('depends')->willReturn(true);
$binding->getClassName()->willReturn(DummyClient::class);
$binding->getParameterValue('depends')->willReturn($condition);

return $factory;
}
}