From f808b01692a835673f328d7221ba8c212caa9b61 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 1 Jul 2017 09:52:38 +0200 Subject: Add a real configuration for CS-Fixer --- .../Event/Listener/LocaleListenerTest.php | 28 +++++++++++----------- .../Event/Listener/UserLocaleListenerTest.php | 4 ++-- .../Event/Subscriber/TablePrefixSubscriberTest.php | 18 +++++++------- 3 files changed, 25 insertions(+), 25 deletions(-) (limited to 'tests/Wallabag/CoreBundle/Event') diff --git a/tests/Wallabag/CoreBundle/Event/Listener/LocaleListenerTest.php b/tests/Wallabag/CoreBundle/Event/Listener/LocaleListenerTest.php index 84a54d3a..0dbd9f70 100644 --- a/tests/Wallabag/CoreBundle/Event/Listener/LocaleListenerTest.php +++ b/tests/Wallabag/CoreBundle/Event/Listener/LocaleListenerTest.php @@ -13,15 +13,6 @@ use Wallabag\CoreBundle\Event\Listener\LocaleListener; class LocaleListenerTest extends \PHPUnit_Framework_TestCase { - private function getEvent(Request $request) - { - $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface') - ->disableOriginalConstructor() - ->getMock(); - - return new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST); - } - public function testWithoutSession() { $request = Request::create('/'); @@ -30,7 +21,7 @@ class LocaleListenerTest extends \PHPUnit_Framework_TestCase $event = $this->getEvent($request); $listener->onKernelRequest($event); - $this->assertEquals('en', $request->getLocale()); + $this->assertSame('en', $request->getLocale()); } public function testWithPreviousSession() @@ -44,7 +35,7 @@ class LocaleListenerTest extends \PHPUnit_Framework_TestCase $event = $this->getEvent($request); $listener->onKernelRequest($event); - $this->assertEquals('fr', $request->getLocale()); + $this->assertSame('fr', $request->getLocale()); } public function testLocaleFromRequestAttribute() @@ -59,8 +50,8 @@ class LocaleListenerTest extends \PHPUnit_Framework_TestCase $event = $this->getEvent($request); $listener->onKernelRequest($event); - $this->assertEquals('en', $request->getLocale()); - $this->assertEquals('es', $request->getSession()->get('_locale')); + $this->assertSame('en', $request->getLocale()); + $this->assertSame('es', $request->getSession()->get('_locale')); } public function testSubscribedEvents() @@ -81,6 +72,15 @@ class LocaleListenerTest extends \PHPUnit_Framework_TestCase $event ); - $this->assertEquals('fr', $request->getLocale()); + $this->assertSame('fr', $request->getLocale()); + } + + private function getEvent(Request $request) + { + $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface') + ->disableOriginalConstructor() + ->getMock(); + + return new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST); } } diff --git a/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php b/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php index 45aecc63..91ce0102 100644 --- a/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php +++ b/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php @@ -32,7 +32,7 @@ class UserLocaleListenerTest extends \PHPUnit_Framework_TestCase $listener->onInteractiveLogin($event); - $this->assertEquals('fr', $session->get('_locale')); + $this->assertSame('fr', $session->get('_locale')); } public function testWithoutLanguage() @@ -53,6 +53,6 @@ class UserLocaleListenerTest extends \PHPUnit_Framework_TestCase $listener->onInteractiveLogin($event); - $this->assertEquals('', $session->get('_locale')); + $this->assertSame('', $session->get('_locale')); } } diff --git a/tests/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriberTest.php b/tests/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriberTest.php index b8cd0fad..64e3c6d9 100644 --- a/tests/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriberTest.php +++ b/tests/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriberTest.php @@ -46,12 +46,12 @@ class TablePrefixSubscriberTest extends \PHPUnit_Framework_TestCase $metaDataEvent = new LoadClassMetadataEventArgs($metaClass, $em); - $this->assertEquals($tableNameExpected, $metaDataEvent->getClassMetadata()->getTableName()); + $this->assertSame($tableNameExpected, $metaDataEvent->getClassMetadata()->getTableName()); $subscriber->loadClassMetadata($metaDataEvent); - $this->assertEquals($finalTableName, $metaDataEvent->getClassMetadata()->getTableName()); - $this->assertEquals($finalTableNameQuoted, $metaDataEvent->getClassMetadata()->getQuotedTableName($platform)); + $this->assertSame($finalTableName, $metaDataEvent->getClassMetadata()->getTableName()); + $this->assertSame($finalTableNameQuoted, $metaDataEvent->getClassMetadata()->getQuotedTableName($platform)); } /** @@ -75,8 +75,8 @@ class TablePrefixSubscriberTest extends \PHPUnit_Framework_TestCase $evm->dispatchEvent('loadClassMetadata', $metaDataEvent); - $this->assertEquals($finalTableName, $metaDataEvent->getClassMetadata()->getTableName()); - $this->assertEquals($finalTableNameQuoted, $metaDataEvent->getClassMetadata()->getQuotedTableName($platform)); + $this->assertSame($finalTableName, $metaDataEvent->getClassMetadata()->getTableName()); + $this->assertSame($finalTableNameQuoted, $metaDataEvent->getClassMetadata()->getQuotedTableName($platform)); } public function testPrefixManyToMany() @@ -103,12 +103,12 @@ class TablePrefixSubscriberTest extends \PHPUnit_Framework_TestCase $metaDataEvent = new LoadClassMetadataEventArgs($metaClass, $em); - $this->assertEquals('entry', $metaDataEvent->getClassMetadata()->getTableName()); + $this->assertSame('entry', $metaDataEvent->getClassMetadata()->getTableName()); $subscriber->loadClassMetadata($metaDataEvent); - $this->assertEquals('yo_entry', $metaDataEvent->getClassMetadata()->getTableName()); - $this->assertEquals('yo_entry_tag', $metaDataEvent->getClassMetadata()->associationMappings['tags']['joinTable']['name']); - $this->assertEquals('yo_entry', $metaDataEvent->getClassMetadata()->getQuotedTableName(new \Doctrine\DBAL\Platforms\MySqlPlatform())); + $this->assertSame('yo_entry', $metaDataEvent->getClassMetadata()->getTableName()); + $this->assertSame('yo_entry_tag', $metaDataEvent->getClassMetadata()->associationMappings['tags']['joinTable']['name']); + $this->assertSame('yo_entry', $metaDataEvent->getClassMetadata()->getQuotedTableName(new \Doctrine\DBAL\Platforms\MySqlPlatform())); } } -- cgit v1.2.3 From 38520658addc217f127b0627ea28dcf8d6e6178c Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 3 Jul 2017 07:30:54 +0200 Subject: Fix tests --- tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/Wallabag/CoreBundle/Event') diff --git a/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php b/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php index 91ce0102..5ffe1ca6 100644 --- a/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php +++ b/tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php @@ -53,6 +53,6 @@ class UserLocaleListenerTest extends \PHPUnit_Framework_TestCase $listener->onInteractiveLogin($event); - $this->assertSame('', $session->get('_locale')); + $this->assertNull($session->get('_locale')); } } -- cgit v1.2.3