Merge branch 'xabbuh-definition-has-tag-constraint'

Author: matthiasnoback

PhpUnit/DefinitionHasTagConstraint.php

@@ -2,15 +2,18 @@
 
 namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
 
+use SebastianBergmann\Exporter\Exporter;
 use Symfony\Component\DependencyInjection\Definition;
 
 class DefinitionHasTagConstraint extends \PHPUnit_Framework_Constraint
 {
+    protected $exporter;
     private $name;
     private $attributes;
 
     public function __construct($name, array $attributes = array())
     {
+        $this->exporter = new Exporter();
         $this->name = $name;
         $this->attributes = $attributes;
     }
@@ -40,14 +43,22 @@ public function evaluate($other, $description = '', $returnResult = false)
                     sprintf(
                         'None of the tags matched the expected name "%s" with attributes %s',
                         $this->name,
-                        \PHPUnit_Util_Type::export($this->attributes)
+                        $this->exporter->export($this->attributes)
                     )
                 );
             }
 
+            if (!$returnResult) {
+                $this->fail($other, $description);
+            }
+
             return false;
         }
 
+        if (!$returnResult) {
+            $this->fail($other, $description);
+        }
+
         return false;
     }
 

Tests/PhpUnit/DefinitionHasTagConstraintTest.php

@@ -18,6 +18,26 @@ public function match(Definition $definition, $tag, $attributes, $expectedToMatc
         $this->assertSame($expectedToMatch, $constraint->evaluate($definition, '', true));
     }
 
+    /**
+     * @test
+     * @dataProvider definitionProvider
+     */
+    public function evaluateThrowsExceptionOnFailure(Definition $definition, $tag, $attributes, $expectedToMatch)
+    {
+        $constraint = new DefinitionHasTagConstraint($tag, $attributes);
+
+        if ($expectedToMatch) {
+            $this->assertTrue($constraint->evaluate($definition));
+        } else {
+            try {
+                $constraint->evaluate($definition);
+                $this->fail('DefinitionHasTagConstraint doesn\'t throw expected exception');
+            } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+                $this->assertTrue(true, 'DefinitionHasTagConstraint throws expected exception');
+            }
+        }
+    }
+
     public function definitionProvider()
     {
         $definitionWithoutTags = new Definition();