From 512d385b4e589e9e10b1c9ff2c64059cfe518f6b Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Sat, 30 Aug 2014 15:52:28 +0200 Subject: [PATCH] Fixing some failing unit tests --- tests/TestCase/Auth/BasicAuthenticateTest.php | 6 +++--- tests/TestCase/Auth/DigestAuthenticateTest.php | 8 ++++---- tests/TestCase/Cache/Engine/RedisEngineTest.php | 1 + tests/TestCase/Controller/Component/AuthComponentTest.php | 7 ++++--- tests/TestCase/Controller/Component/CsrfComponentTest.php | 4 ++-- .../Controller/Component/PaginatorComponentTest.php | 6 +++--- tests/TestCase/Network/ResponseTest.php | 8 ++++---- 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/tests/TestCase/Auth/BasicAuthenticateTest.php b/tests/TestCase/Auth/BasicAuthenticateTest.php index ab270d6ac58..9e6cd063986 100644 --- a/tests/TestCase/Auth/BasicAuthenticateTest.php +++ b/tests/TestCase/Auth/BasicAuthenticateTest.php @@ -15,7 +15,7 @@ namespace Cake\Test\TestCase\Auth; use Cake\Auth\BasicAuthenticate; -use Cake\Error; +use Cake\Network\Exception\UnauthorizedException; use Cake\Network\Request; use Cake\ORM\Entity; use Cake\ORM\TableRegistry; @@ -168,7 +168,7 @@ public function testAuthenticateChallenge() { try { $this->auth->unauthenticated($request, $this->response); - } catch (Error\UnauthorizedException $e) { + } catch (UnauthorizedException $e) { } $this->assertNotEmpty($e); @@ -205,7 +205,7 @@ public function testAuthenticateSuccess() { /** * test scope failure. * - * @expectedException \Cake\Error\UnauthorizedException + * @expectedException \Cake\Network\Exception\UnauthorizedException * @expectedExceptionCode 401 * @return void */ diff --git a/tests/TestCase/Auth/DigestAuthenticateTest.php b/tests/TestCase/Auth/DigestAuthenticateTest.php index 607668229cf..daf42d8fba3 100644 --- a/tests/TestCase/Auth/DigestAuthenticateTest.php +++ b/tests/TestCase/Auth/DigestAuthenticateTest.php @@ -17,7 +17,7 @@ namespace Cake\Test\TestCase\Auth; use Cake\Auth\DigestAuthenticate; -use Cake\Error; +use Cake\Network\Exception\UnauthorizedException; use Cake\Network\Request; use Cake\ORM\Entity; use Cake\ORM\TableRegistry; @@ -93,7 +93,7 @@ public function testAuthenticateNoData() { /** * test the authenticate method * - * @expectedException \Cake\Error\UnauthorizedException + * @expectedException \Cake\Network\Exception\UnauthorizedException * @expectedExceptionCode 401 * @return void */ @@ -131,7 +131,7 @@ public function testAuthenticateChallenge() { try { $this->auth->unauthenticated($request, $this->response); - } catch (Error\UnauthorizedException $e) { + } catch (UnauthorizedException $e) { } $this->assertNotEmpty($e); @@ -178,7 +178,7 @@ public function testAuthenticateSuccess() { /** * test scope failure. * - * @expectedException \Cake\Error\UnauthorizedException + * @expectedException \Cake\Network\Exception\UnauthorizedException * @expectedExceptionCode 401 * @return void */ diff --git a/tests/TestCase/Cache/Engine/RedisEngineTest.php b/tests/TestCase/Cache/Engine/RedisEngineTest.php index 3b9821f0059..c6541fddbb8 100644 --- a/tests/TestCase/Cache/Engine/RedisEngineTest.php +++ b/tests/TestCase/Cache/Engine/RedisEngineTest.php @@ -87,6 +87,7 @@ public function testConfig() { 'persistent' => true, 'password' => false, 'database' => 0, + 'unix_socket' => false ); $this->assertEquals($expecting, $config); } diff --git a/tests/TestCase/Controller/Component/AuthComponentTest.php b/tests/TestCase/Controller/Component/AuthComponentTest.php index 611273134e5..e4e88542d9d 100644 --- a/tests/TestCase/Controller/Component/AuthComponentTest.php +++ b/tests/TestCase/Controller/Component/AuthComponentTest.php @@ -19,8 +19,9 @@ use Cake\Controller\Controller; use Cake\Core\App; use Cake\Core\Configure; -use Cake\Error; use Cake\Event\Event; +use Cake\Network\Exception\ForbiddenException; +use Cake\Network\Exception\UnauthorizedException; use Cake\Network\Request; use Cake\Network\Response; use Cake\Network\Session; @@ -789,7 +790,7 @@ public function testRedirectToUnauthorizedRedirectSuppressedAuthError() { /** * Throw ForbiddenException if config `unauthorizedRedirect` is set to false * - * @expectedException \Cake\Error\ForbiddenException + * @expectedException \Cake\Network\Exception\ForbiddenException * @return void */ public function testForbiddenException() { @@ -1261,7 +1262,7 @@ public function testUser() { /** * testStatelessAuthNoRedirect method * - * @expectedException \Cake\Error\UnauthorizedException + * @expectedException \Cake\Network\Exception\UnauthorizedException * @expectedExceptionCode 401 * @return void */ diff --git a/tests/TestCase/Controller/Component/CsrfComponentTest.php b/tests/TestCase/Controller/Component/CsrfComponentTest.php index b947617a8ff..fec16de4ac4 100644 --- a/tests/TestCase/Controller/Component/CsrfComponentTest.php +++ b/tests/TestCase/Controller/Component/CsrfComponentTest.php @@ -107,7 +107,7 @@ public function testValidTokenInHeader($method) { * Test that the X-CSRF-Token works with the various http methods. * * @dataProvider httpMethodProvider - * @expectedException \Cake\Error\ForbiddenException + * @expectedException \Cake\Network\Exception\ForbiddenException * @return void */ public function testInvalidTokenInHeader($method) { @@ -149,7 +149,7 @@ public function testValidTokenRequestData($method) { * Test that request data works with the various http methods. * * @dataProvider httpMethodProvider - * @expectedException \Cake\Error\ForbiddenException + * @expectedException \Cake\Network\Exception\ForbiddenException * @return void */ public function testInvalidTokenRequestData($method) { diff --git a/tests/TestCase/Controller/Component/PaginatorComponentTest.php b/tests/TestCase/Controller/Component/PaginatorComponentTest.php index dd1d2e8fbb3..8c91dfc6983 100644 --- a/tests/TestCase/Controller/Component/PaginatorComponentTest.php +++ b/tests/TestCase/Controller/Component/PaginatorComponentTest.php @@ -19,7 +19,7 @@ use Cake\Controller\Controller; use Cake\Core\Configure; use Cake\Datasource\ConnectionManager; -use Cake\Error; +use Cake\Network\Exception\NotFoundException; use Cake\Network\Request; use Cake\ORM\TableRegistry; use Cake\TestSuite\TestCase; @@ -472,7 +472,7 @@ public function testOutOfRangePageNumberGetsClamped() { try { $this->Paginator->paginate($table); $this->fail('No exception raised'); - } catch (\Cake\Error\NotFoundException $e) { + } catch (NotFoundException $e) { $this->assertEquals( 1, $this->request->params['paging']['PaginatorPosts']['page'], @@ -484,7 +484,7 @@ public function testOutOfRangePageNumberGetsClamped() { /** * Test that a really REALLY large page number gets clamped to the max page size. * - * @expectedException \Cake\Error\NotFoundException + * @expectedException \Cake\Network\Exception\NotFoundException * @return void */ public function testOutOfVeryBigPageNumberGetsClamped() { diff --git a/tests/TestCase/Network/ResponseTest.php b/tests/TestCase/Network/ResponseTest.php index 4cd498cdee8..6bc065b865a 100644 --- a/tests/TestCase/Network/ResponseTest.php +++ b/tests/TestCase/Network/ResponseTest.php @@ -113,7 +113,7 @@ public function testCharset() { /** * Tests the statusCode method * - * @expectedException \Cake\Core\Exception\Exception + * @expectedException InvalidArgumentException * @return void */ public function testStatusCode() { @@ -398,7 +398,7 @@ public function testCompress() { /** * Tests the httpCodes method * - * @expectedException \Cake\Core\Exception\Exception + * @expectedException InvalidArgumentException * @return void */ public function testHttpCodes() { @@ -1158,7 +1158,7 @@ public function corsData() { /** * testFileNotFound * - * @expectedException \Cake\Error\NotFoundException + * @expectedException InvalidArgumentException * @return void */ public function testFileNotFound() { @@ -1169,7 +1169,7 @@ public function testFileNotFound() { /** * test file with .. * - * @expectedException Cake\Error\NotFoundException + * @expectedException InvalidArgumentException * @return void */ public function testFileWithPathTraversal() {