no longer use the internal TestFailure class

Author: xabbuh

src/Symfony/Component/BrowserKit/Tests/Test/Constraint/BrowserCookieValueSameTest.php

@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\TestFailure;
 use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\BrowserKit\Cookie;
 use Symfony\Component\BrowserKit\CookieJar;
@@ -31,15 +30,10 @@ public function testConstraint()
         $constraint = new BrowserCookieValueSame('foo', 'babar', false, '/path');
         $this->assertFalse($constraint->evaluate($browser, '', true));
 
-        try {
-            $constraint->evaluate($browser);
-        } catch (ExpectationFailedException $e) {
-            $this->assertEquals("Failed asserting that the Browser has cookie \"foo\" with path \"/path\" with value \"babar\".\n", TestFailure::exceptionToString($e));
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the Browser has cookie "foo" with path "/path" with value "babar".');
 
-            return;
-        }
-
-        $this->fail();
+        $constraint->evaluate($browser);
     }
 
     private function getBrowser(): AbstractBrowser

src/Symfony/Component/BrowserKit/Tests/Test/Constraint/BrowserHasCookieTest.php

@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\TestFailure;
 use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\BrowserKit\Cookie;
 use Symfony\Component\BrowserKit\CookieJar;
@@ -31,45 +30,32 @@ public function testConstraint()
         $constraint = new BrowserHasCookie('bar');
         $this->assertFalse($constraint->evaluate($browser, '', true));
 
-        try {
-            $constraint->evaluate($browser);
-        } catch (ExpectationFailedException $e) {
-            $this->assertEquals("Failed asserting that the Browser has cookie \"bar\".\n", TestFailure::exceptionToString($e));
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the Browser has cookie "bar".');
 
-            return;
-        }
-
-        $this->fail();
+        $constraint->evaluate($browser);
     }
 
     public function testConstraintWithWrongPath()
     {
         $browser = $this->getBrowser();
         $constraint = new BrowserHasCookie('foo', '/other');
-        try {
-            $constraint->evaluate($browser);
-        } catch (ExpectationFailedException $e) {
-            $this->assertEquals("Failed asserting that the Browser has cookie \"foo\" with path \"/other\".\n", TestFailure::exceptionToString($e));
 
-            return;
-        }
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the Browser has cookie "foo" with path "/other".');
 
-        $this->fail();
+        $constraint->evaluate($browser);
     }
 
     public function testConstraintWithWrongDomain()
     {
         $browser = $this->getBrowser();
         $constraint = new BrowserHasCookie('foo', '/path', 'example.org');
-        try {
-            $constraint->evaluate($browser);
-        } catch (ExpectationFailedException $e) {
-            $this->assertEquals("Failed asserting that the Browser has cookie \"foo\" with path \"/path\" for domain \"example.org\".\n", TestFailure::exceptionToString($e));
 
-            return;
-        }
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the Browser has cookie "foo" with path "/path" for domain "example.org".');
 
-        $this->fail();
+        $constraint->evaluate($browser);
     }
 
     private function getBrowser(): AbstractBrowser

src/Symfony/Component/Console/Tests/Tester/Constraint/CommandIsSuccessfulTest.php

@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\TestFailure;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Tester\Constraint\CommandIsSuccessful;
 
@@ -35,16 +34,9 @@ public function testUnsuccessfulCommand(string $expectedException, int $exitCode
     {
         $constraint = new CommandIsSuccessful();
 
-        try {
-            $constraint->evaluate($exitCode);
-        } catch (ExpectationFailedException $e) {
-            $this->assertStringContainsString('Failed asserting that the command is successful.', TestFailure::exceptionToString($e));
-            $this->assertStringContainsString($expectedException, TestFailure::exceptionToString($e));
-
-            return;
-        }
-
-        $this->fail();
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessageMatches('/Failed asserting that the command is successful\..*'.$expectedException.'/s');
+        $constraint->evaluate($exitCode);
     }
 
     public static function providesUnsuccessful(): iterable

src/Symfony/Component/DomCrawler/Tests/Test/Constraint/CrawlerAnySelectorTextContainsTest.php

@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\TestFailure;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\DomCrawler\Test\Constraint\CrawlerAnySelectorTextContains;
 
@@ -27,23 +26,25 @@ public function testConstraint()
         self::assertTrue($constraint->evaluate(new Crawler('<ul><li>Bar</li><li>Foo'), '', true));
         self::assertTrue($constraint->evaluate(new Crawler('<ul><li>Bar</li><li>Foo Bar Baz'), '', true));
         self::assertFalse($constraint->evaluate(new Crawler('<ul><li>Bar</li><li>Baz'), '', true));
+    }
 
-        try {
-            $constraint->evaluate(new Crawler('<ul><li>Bar</li><li>Baz'));
+    public function testDoesNotMatchIfNodeDoesContainExpectedText()
+    {
+        $constraint = new CrawlerAnySelectorTextContains('ul li', 'Foo');
 
-            self::fail();
-        } catch (ExpectationFailedException $e) {
-            self::assertEquals("Failed asserting that the text of any node matching selector \"ul li\" contains \"Foo\".\n", TestFailure::exceptionToString($e));
-        }
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the text of any node matching selector "ul li" contains "Foo".');
 
-        try {
-            $constraint->evaluate(new Crawler('<html><head><title>Foobar'));
+        $constraint->evaluate(new Crawler('<ul><li>Bar</li><li>Baz'));
+    }
+
+    public function testDoesNotMatchIfNodeDoesNotExist()
+    {
+        $constraint = new CrawlerAnySelectorTextContains('ul li', 'Foo');
 
-            self::fail();
-        } catch (ExpectationFailedException $e) {
-            self::assertEquals("Failed asserting that the Crawler has a node matching selector \"ul li\".\n", TestFailure::exceptionToString($e));
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the Crawler has a node matching selector "ul li".');
 
-            return;
-        }
+        $constraint->evaluate(new Crawler('<html><head><title>Foobar'));
     }
 }

src/Symfony/Component/DomCrawler/Tests/Test/Constraint/CrawlerAnySelectorTextSameTest.php

@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\TestFailure;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\DomCrawler\Test\Constraint\CrawlerAnySelectorTextSame;
 
@@ -28,12 +27,9 @@ public function testConstraint()
         self::assertFalse($constraint->evaluate(new Crawler('<ul><li>Bar</li><li>Foo Bar Baz'), '', true));
         self::assertFalse($constraint->evaluate(new Crawler('<ul><li>Bar</li><li>Baz'), '', true));
 
-        try {
-            $constraint->evaluate(new Crawler('<ul><li>Bar</li><li>Baz'));
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the Crawler has at least a node matching selector "ul li" with content "Foo".');
 
-            self::fail();
-        } catch (ExpectationFailedException $e) {
-            self::assertEquals("Failed asserting that the Crawler has at least a node matching selector \"ul li\" with content \"Foo\".\n", TestFailure::exceptionToString($e));
-        }
+        $constraint->evaluate(new Crawler('<ul><li>Bar</li><li>Baz'));
     }
 }

src/Symfony/Component/DomCrawler/Tests/Test/Constraint/CrawlerSelectorAttributeValueSameTest.php

@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\TestFailure;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\DomCrawler\Test\Constraint\CrawlerSelectorAttributeValueSame;
 
@@ -26,14 +25,9 @@ public function testConstraint()
         $this->assertFalse($constraint->evaluate(new Crawler('<html><body><form><input type="text" name="username">'), '', true));
         $this->assertFalse($constraint->evaluate(new Crawler('<html><head><title>Bar'), '', true));
 
-        try {
-            $constraint->evaluate(new Crawler('<html><head><title>Bar'));
-        } catch (ExpectationFailedException $e) {
-            $this->assertEquals("Failed asserting that the Crawler has a node matching selector \"input[name=\"username\"]\" with attribute \"value\" of value \"Fabien\".\n", TestFailure::exceptionToString($e));
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the Crawler has a node matching selector "input[name="username"]" with attribute "value" of value "Fabien".');
 
-            return;
-        }
-
-        $this->fail();
+        $constraint->evaluate(new Crawler('<html><head><title>Bar'));
     }
 }

src/Symfony/Component/DomCrawler/Tests/Test/Constraint/CrawlerSelectorExistsTest.php

@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\TestFailure;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\DomCrawler\Test\Constraint\CrawlerSelectorExists;
 
@@ -26,14 +25,9 @@ public function testConstraint()
         $constraint = new CrawlerSelectorExists('h1');
         $this->assertFalse($constraint->evaluate(new Crawler('<html><head><title>'), '', true));
 
-        try {
-            $constraint->evaluate(new Crawler('<html><head><title>'));
-        } catch (ExpectationFailedException $e) {
-            $this->assertEquals("Failed asserting that the Crawler matches selector \"h1\".\n", TestFailure::exceptionToString($e));
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the Crawler matches selector "h1".');
 
-            return;
-        }
-
-        $this->fail();
+        $constraint->evaluate(new Crawler('<html><head><title>'));
     }
 }

src/Symfony/Component/DomCrawler/Tests/Test/Constraint/CrawlerSelectorTextContainsTest.php

@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\TestFailure;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\DomCrawler\Test\Constraint\CrawlerSelectorTextContains;
 
@@ -25,21 +24,25 @@ public function testConstraint()
         $this->assertTrue($constraint->evaluate(new Crawler('<html><head><title>Foobar'), '', true));
         $this->assertFalse($constraint->evaluate(new Crawler('<html><head><title>Bar'), '', true));
         $this->assertFalse($constraint->evaluate(new Crawler('<html><head></head><body>Bar'), '', true));
+    }
+
+    public function testDoesNotMatchIfNodeTextIsNotExpectedValue()
+    {
+        $constraint = new CrawlerSelectorTextContains('title', 'Foo');
 
-        try {
-            $constraint->evaluate(new Crawler('<html><head><title>Bar'));
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the text "Bar" of the node matching selector "title" contains "Foo".');
 
-            $this->fail();
-        } catch (ExpectationFailedException $e) {
-            $this->assertEquals("Failed asserting that the text \"Bar\" of the node matching selector \"title\" contains \"Foo\".\n", TestFailure::exceptionToString($e));
-        }
+        $constraint->evaluate(new Crawler('<html><head><title>Bar'));
+    }
+
+    public function testDoesNotMatchIfNodeDoesNotExist()
+    {
+        $constraint = new CrawlerSelectorTextContains('title', 'Foo');
 
-        try {
-            $constraint->evaluate(new Crawler('<html><head></head><body>Bar'));
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the Crawler has a node matching selector "title".');
 
-            $this->fail();
-        } catch (ExpectationFailedException $e) {
-            $this->assertEquals("Failed asserting that the Crawler has a node matching selector \"title\".\n", TestFailure::exceptionToString($e));
-        }
+        $constraint->evaluate(new Crawler('<html><head></head><body>Bar'));
     }
 }

src/Symfony/Component/DomCrawler/Tests/Test/Constraint/CrawlerSelectorTextSameTest.php

@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\TestFailure;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\DomCrawler\Test\Constraint\CrawlerSelectorTextSame;
 
@@ -25,14 +24,9 @@ public function testConstraint()
         $this->assertTrue($constraint->evaluate(new Crawler('<html><head><title>Foo'), '', true));
         $this->assertFalse($constraint->evaluate(new Crawler('<html><head><title>Bar'), '', true));
 
-        try {
-            $constraint->evaluate(new Crawler('<html><head><title>Bar'));
-        } catch (ExpectationFailedException $e) {
-            $this->assertEquals("Failed asserting that the Crawler has a node matching selector \"title\" with content \"Foo\".\n", TestFailure::exceptionToString($e));
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the Crawler has a node matching selector "title" with content "Foo".');
 
-            return;
-        }
-
-        $this->fail();
+        $constraint->evaluate(new Crawler('<html><head><title>Bar'));
     }
 }

src/Symfony/Component/HttpFoundation/Tests/Test/Constraint/RequestAttributeValueSameTest.php

@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\TestFailure;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Test\Constraint\RequestAttributeValueSame;
 
@@ -28,14 +27,9 @@ public function testConstraint()
         $constraint = new RequestAttributeValueSame('bar', 'foo');
         $this->assertFalse($constraint->evaluate($request, '', true));
 
-        try {
-            $constraint->evaluate($request);
-        } catch (ExpectationFailedException $e) {
-            $this->assertEquals("Failed asserting that the Request has attribute \"bar\" with value \"foo\".\n", TestFailure::exceptionToString($e));
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the Request has attribute "bar" with value "foo".');
 
-            return;
-        }
-
-        $this->fail();
+        $constraint->evaluate($request);
     }
 }