Adapted tests to verify that the request is checked for validity before asking for a token

Author: Ocramius

tests/ZfrOAuth2ModuleTest/Server/Authentication/AuthenticationFunctionalTest.php

@@ -77,6 +77,13 @@ public function testSuccessAuthenticationOnValidToken()
         $owner = $this->getMock('ZfrOAuth2\Server\Entity\TokenOwnerInterface');
         $token->setOwner($owner);
 
+        $this
+            ->resourceServer
+            ->expects($this->atLeastOnce())
+            ->method('isRequestValid')
+            ->with($request)
+            ->will($this->returnValue(true));
+
         $this
             ->resourceServer
             ->expects($this->atLeastOnce())
@@ -102,9 +109,11 @@ public function testFailAuthenticationOnNoToken()
         $this
             ->resourceServer
             ->expects($this->atLeastOnce())
-            ->method('getAccessToken')
+            ->method('isRequestValid')
             ->with($request)
-            ->will($this->returnValue(null));
+            ->will($this->returnValue(false));
+
+        $this->resourceServer->expects($this->never())->method('getAccessToken');
 
         $this->assertFalse($this->authenticationService->hasIdentity());
         $this->assertNull($this->authenticationService->getIdentity());
@@ -120,6 +129,13 @@ public function testFailAuthenticationOnExpiredToken()
         $owner = $this->getMock('ZfrOAuth2\Server\Entity\TokenOwnerInterface');
         $token->setOwner($owner);
 
+        $this
+            ->resourceServer
+            ->expects($this->atLeastOnce())
+            ->method('isRequestValid')
+            ->with($request)
+            ->will($this->returnValue(true));
+
         $this
             ->resourceServer
             ->expects($this->atLeastOnce())
@@ -134,6 +150,7 @@ public function testFailAuthenticationOnExpiredToken()
 
     public function testFailAuthenticationOnNoRequest()
     {
+        $this->resourceServer->expects($this->never())->method('isRequestValid');
         $this->resourceServer->expects($this->never())->method('getAccessToken');
 
         $this->assertFalse($this->authenticationService->hasIdentity());
@@ -146,6 +163,7 @@ public function testFailAuthenticationOnNonHttpRequest()
 
         $this->mvcEvent->expects($this->any())->method('getRequest')->will($this->returnValue($request));
 
+        $this->resourceServer->expects($this->never())->method('isRequestValid');
         $this->resourceServer->expects($this->never())->method('getAccessToken');
 
         $this->assertFalse($this->authenticationService->hasIdentity());

tests/ZfrOAuth2ModuleTest/Server/Authentication/Storage/AccessTokenStorageTest.php

@@ -65,9 +65,11 @@ public function testIsConsideredAsEmptyIfNoAccessToken()
     {
         $this->resourceServer
             ->expects($this->atLeastOnce())
-            ->method('getAccessToken')
+            ->method('isRequestValid')
             ->with($this->request)
-            ->will($this->returnValue(null));
+            ->will($this->returnValue(false));
+
+        $this->resourceServer->expects($this->never())->method('getAccessToken');
 
         $this->assertTrue($this->storage->isEmpty());
         $this->assertNull($this->storage->read());
@@ -80,6 +82,12 @@ public function testReadOwnerFromAccessToken()
 
         $token->setOwner($owner);
 
+        $this->resourceServer
+            ->expects($this->atLeastOnce())
+            ->method('isRequestValid')
+            ->with($this->request)
+            ->will($this->returnValue(true));
+
         $this->resourceServer
             ->expects($this->atLeastOnce())
             ->method('getAccessToken')