From b6089dc6a1167240e863cfe53d97dba8f09dd80d Mon Sep 17 00:00:00 2001 From: Lee Davis Date: Tue, 16 Jul 2013 15:17:49 +0100 Subject: [PATCH] update --- .../Request/Adapter/Symfony2Test.php | 18 ++++++++ .../DrestCommonTests/Request/RequestTest.php | 44 +++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/tests/DrestCommonTests/Request/Adapter/Symfony2Test.php b/tests/DrestCommonTests/Request/Adapter/Symfony2Test.php index 296326a..364effc 100644 --- a/tests/DrestCommonTests/Request/Adapter/Symfony2Test.php +++ b/tests/DrestCommonTests/Request/Adapter/Symfony2Test.php @@ -35,6 +35,8 @@ public function testCanSaveAndRetrieveCookie() { $request = self::getSymfonyAdapterRequest(); + $this->assertEmpty($request->getCookie()); + $cookieName = 'frodo'; $cookieValue = 'baggins'; @@ -45,6 +47,8 @@ public function testCanSaveAndRetrieveCookie() $this->assertCount(1, $request->getCookie()); $this->assertEquals($cookieValue, $request->getCookie($cookieName)); + $this->assertEquals('', $request->getCookie('notset')); + $newCookies = array('samwise' => 'gamgee', 'peregrin' => 'took'); $symRequestObject->cookies->replace($newCookies); @@ -130,4 +134,18 @@ public function testCanSaveCombinedParamTypes() $this->assertCount(3, $request->getParams()); } + /** + * @expectedException \DrestCommon\Request\RequestException + */ + public function testUnknownHttpVerb() + { + $symRequest = \Symfony\Component\HttpFoundation\Request::create( + '/users', + 'CUSTOM' + ); + $request = Request::create($symRequest); + + $request->getHttpMethod(); + } + } \ No newline at end of file diff --git a/tests/DrestCommonTests/Request/RequestTest.php b/tests/DrestCommonTests/Request/RequestTest.php index aaab48c..ab53f23 100644 --- a/tests/DrestCommonTests/Request/RequestTest.php +++ b/tests/DrestCommonTests/Request/RequestTest.php @@ -40,5 +40,49 @@ public function testCreateRequestWithSymfony2RequestObject() // Ensure request object creates a symfony2 request $this->assertInstanceOf('Symfony\Component\HttpFoundation\Request', $request->getRequest()); } + + public function testSettingRouteParams() + { + $request = Request::create(); + $params = array('name' => 'bilbo', 'address' => 'the shire'); + $request->setRouteParam($params); + $this->assertEquals($params, $request->getRouteParam()); + $this->assertEquals('bilbo', $request->getRouteParam('name')); + + $request->setRouteParam('name', 'frodo'); + $this->assertEquals('frodo', $request->getRouteParam('name')); + } + + public function testGetPath() + { + $symRequest = \Symfony\Component\HttpFoundation\Request::create( + '/users', + 'GET' + ); + + $request = Request::create($symRequest); + $this->assertEquals('/users', $request->getPath()); + } + + public function testGetPathWithAdditions() + { + $symRequest = \Symfony\Component\HttpFoundation\Request::create( + '/users?a=1#t12', + 'GET' + ); + + $request = Request::create($symRequest); + $this->assertEquals('/users', $request->getPath()); + + $symRequest = \Symfony\Component\HttpFoundation\Request::create( + '/users#t12', + 'GET' + ); + + $request = Request::create($symRequest); + $this->assertEquals('/users', $request->getPath()); + } + + }