Added tests for Httplug factory

Author: Nyholm

HttplugFactory.php

@@ -79,8 +79,6 @@ private function findOneByType($type)
      * @param mixed $condition
      *
      * @return bool
-     *
-     * TODO: review this method
      */
     protected function evaluateCondition($condition)
     {
@@ -95,11 +93,14 @@ 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]);
+            foreach ($condition as $c) {
+                $evaluatedCondition = $evaluatedCondition && $this->evaluateCondition($c);
+                if ($evaluatedCondition === false) {
+                    return false;
+                }
             }
 
-            return $evaluatedCondition;
+            return true;
         }
 
         return false;

Tests/Unit/HttplugFactoryTest.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Http\HttplugBundle\Tests\Unit\ClientFactory;
+
+use Http\HttplugBundle\Collector\MessageJournal;
+use Http\HttplugBundle\HttplugFactory;
+use Puli\Discovery\Api\Discovery;
+
+
+/**
+ * @author Tobias Nyholm <[email protected]>
+ */
+class HttplugFactoryTest  extends \PHPUnit_Framework_TestCase
+{
+    public function testEvaluateCondition()
+    {
+        $method = new \ReflectionMethod(HttplugFactory::class, 'evaluateCondition');
+        $method->setAccessible(true);
+        $factory = new HttplugFactory($this->getMock(Discovery::class));
+        $existingClass = MessageJournal::class;
+
+        // String
+        $result = $method->invoke($factory, $existingClass);
+        $this->assertTrue($result);
+        $result = $method->invoke($factory, 'non_existent_class');
+        $this->assertFalse($result);
+
+        // Callable
+        $result = $method->invoke($factory, function() {return 'value';});
+        $this->assertEquals('value', $result);
+
+        // Boolean
+        $result = $method->invoke($factory, true);
+        $this->assertTrue($result);
+        $result = $method->invoke($factory, false);
+        $this->assertFalse($result);
+
+        // Array
+        $result = $method->invoke($factory, [true, $existingClass]);
+        $this->assertTrue((bool) $result);
+        $result = $method->invoke($factory, [true, $existingClass, false]);
+        $this->assertFalse((bool) $result);
+
+        // Associative array
+        $result = $method->invoke($factory, ['test1'=>true, $existingClass]);
+        $this->assertTrue((bool) $result);
+
+    }
+}