X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2FWallabag%2FCoreBundle%2FParamConverter%2FUsernameRssTokenConverterTest.php;h=b044a700ef3dd672732a25fa8a4e0013401633a1;hb=739a4024fa64ba5412078e01c8ae84628f865f26;hp=e29b58b5795c35f3e29d4c56cf854f00f2af541e;hpb=23634d5d842dabcf5d7475e2becb7e127824239e;p=github%2Fwallabag%2Fwallabag.git diff --git a/tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php b/tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php index e29b58b5..b044a700 100644 --- a/tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php +++ b/tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php @@ -2,12 +2,13 @@ namespace Tests\Wallabag\CoreBundle\Command; +use PHPUnit\Framework\TestCase; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Component\HttpFoundation\Request; use Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter; use Wallabag\UserBundle\Entity\User; -class UsernameRssTokenConverterTest extends \PHPUnit_Framework_TestCase +class UsernameRssTokenConverterTest extends TestCase { public function testSupportsWithNoRegistry() { @@ -125,20 +126,18 @@ class UsernameRssTokenConverterTest extends \PHPUnit_Framework_TestCase $this->assertTrue($converter->supports($params)); } - /** - * @expectedException InvalidArgumentException - * @expectedExceptionMessage Route attribute is missing - */ public function testApplyEmptyRequest() { $params = new ParamConverter([]); $converter = new UsernameRssTokenConverter(); - $converter->apply(new Request(), $params); + $res = $converter->apply(new Request(), $params); + + $this->assertFalse($res); } /** - * @expectedException Symfony\Component\HttpKernel\Exception\NotFoundHttpException + * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException * @expectedExceptionMessage User not found */ public function testApplyUserNotFound() @@ -214,6 +213,6 @@ class UsernameRssTokenConverterTest extends \PHPUnit_Framework_TestCase $converter->apply($request, $params); - $this->assertEquals($user, $request->attributes->get('user')); + $this->assertSame($user, $request->attributes->get('user')); } }