Separated out output tests into own test class. Created Test Suite

Dave Rochwerger · Dave Rochwerger · commit 90badc7f9401 · 2011-06-29T11:47:03.000-07:00
diff --git a/tests/OAuth2OutputTest.php b/tests/OAuth2OutputTest.php
@@ -0,0 +1,53 @@
+<?php
+require_once(__DIR__ . '/../lib/OAuth2.php');
+require_once(__DIR__ . '/../lib/IOAuth2Storage.php');
+require_once(__DIR__ . '/../lib/IOAuth2GrantCode.php');
+
+/**
+ * OAuth2 test cases that invovle capturing output.
+ */
+class OAuth2OutputTest extends PHPUnit_Extensions_OutputTestCase {
+  
+  /**
+   * @var OAuth2
+   */
+  private $fixture;
+  
+  /**
+   * Tests OAuth2->grantAccessToken() with successful Auth code grant
+   * 
+   */
+  public function testGrantAccessTokenWithGrantAuthCodeSuccess() {
+    $inputData = array('grant_type' => OAuth2::GRANT_TYPE_AUTH_CODE, 'redirect_uri' => 'http://www.example.com/my/subdir', 'client_id' => 'my_little_app', 'client_secret' => 'b', 'code'=> 'foo');
+    $storedToken = array('redirect_uri' => 'http://www.example.com', 'client_id' => 'my_little_app', 'expires' => time() + 60);
+    
+    $mockStorage = $this->createBaseMock('IOAuth2GrantCode');
+    $mockStorage->expects($this->any())
+      ->method('getAuthCode')
+      ->will($this->returnValue($storedToken));
+      
+    // Successful token grant will return a JSON encoded token:
+    $this->expectOutputRegex('/{"access_token":".*","expires_in":\d+,"token_type":"bearer"/');
+    $this->fixture = new OAuth2($mockStorage);
+    $this->fixture->grantAccessToken($inputData, array(), FALSE);
+  }
+  
+// Utility methods
+  
+  /**
+   * 
+   * @param string $interfaceName
+   */
+  protected function createBaseMock($interfaceName) {
+    $mockStorage = $this->getMock($interfaceName);
+    $mockStorage->expects($this->any())
+      ->method('checkClientCredentials')
+      ->will($this->returnValue(TRUE)); // Always return true for any combination of user/pass
+    $mockStorage->expects($this->any())
+      ->method('checkRestrictedGrantType')
+      ->will($this->returnValue(TRUE)); // Always return true for any combination of user/pass
+      
+     return $mockStorage;
+  }
+  
+}
diff --git a/tests/OAuth2Suite.php b/tests/OAuth2Suite.php
@@ -3,13 +3,21 @@
 /**
  * Static test suite.
  */
+
 class OAuth2Suite extends PHPUnit_Framework_TestSuite {
   
   /**
    * Constructs the test suite handler.
    */
   public function __construct() {
     $this->setName ( 'OAuth2Suite' );
+
+    foreach (glob(__DIR__.'/*Test.php') as $filename) {
+      require_once($filename);
+      $class = basename($filename, '.php');
+    //  $this->addTest(new $class());
+      $this->addTestSuite($class);
+    }
   }
   
   /**
diff --git a/tests/OAuth2Test.php b/tests/OAuth2Test.php
@@ -6,7 +6,7 @@
 /**
  * OAuth2 test case.
  */
-class OAuth2Test extends PHPUnit_Extensions_OutputTestCase {
+class OAuth2Test extends PHPUnit_Framework_TestCase {
   
   /**
    * @var OAuth2
@@ -19,22 +19,6 @@ class OAuth2Test extends PHPUnit_Extensions_OutputTestCase {
    */
   private $tokenId = 'my_token';
   
-  /**
-   * Prepares the environment before running a test.
-   */
-  protected function setUp() {
-    parent::setUp ();
-//    $this->fixture = new OAuth2(/* parameters */);
-  }
-  
-  /**
-   * Cleans up the environment after running a test.
-   */
-  protected function tearDown() {
-    $this->fixture = null;
-    parent::tearDown ();
-  }
-  
   /**
    * Tests OAuth2->verifyAccessToken() with a missing token
    */
@@ -143,7 +127,7 @@ public function testVerifyAccessTokenCheckScope($scopeRequired, $token, $expecte
   }
   
   /**
-   * Tests OAuth2->grantAccessToken()
+   * Tests OAuth2->grantAccessToken() for missing data
    * 
    * @dataProvider generateEmptyDataForGrant
    */
@@ -158,7 +142,7 @@ public function testGrantAccessTokenMissingData($inputData, $authHeaders) {
   /**
    * Tests OAuth2->grantAccessToken()
    * 
-   * Tests the different ways a client credentials can be provided.
+   * Tests the different ways client credentials can be provided.
    */
   public function testGrantAccessTokenCheckClientCredentials() {
     $mockStorage = $this->getMock('IOAuth2Storage');
@@ -170,7 +154,7 @@ public function testGrantAccessTokenCheckClientCredentials() {
     $inputData = array('grant_type' => OAuth2::GRANT_TYPE_AUTH_CODE);
     $authHeaders = array();
     
-    // First, confirm that an non client related error is thrown:
+    // First, confirm that an non-client related error is thrown:
     try {
       $this->fixture->grantAccessToken($inputData, $authHeaders);
       $this->fail('The expected exception OAuth2ServerException was not thrown');
@@ -254,25 +238,6 @@ public function testGrantAccessTokenWithGrantAuthCodeNoToken() {
     }
   }
   
-  /**
-   * Tests OAuth2->grantAccessToken() with successful Auth code grant
-   * 
-   */
-  public function testGrantAccessTokenWithGrantAuthCodeSuccess() {
-    $inputData = array('grant_type' => OAuth2::GRANT_TYPE_AUTH_CODE, 'redirect_uri' => 'http://www.example.com/my/subdir', 'client_id' => 'my_little_app', 'client_secret' => 'b', 'code'=> 'foo');
-    $storedToken = array('redirect_uri' => 'http://www.example.com', 'client_id' => 'my_little_app', 'expires' => time() + 60);
-    
-    $mockStorage = $this->createBaseMock('IOAuth2GrantCode');
-    $mockStorage->expects($this->any())
-      ->method('getAuthCode')
-      ->will($this->returnValue($storedToken));
-      
-    // Successful token grant will return a JSON encoded token:
-    $this->expectOutputRegex('/{"access_token":".*","expires_in":\d+,"token_type":"bearer"/');
-    $this->fixture = new OAuth2($mockStorage);
-    $this->fixture->grantAccessToken($inputData, array(), FALSE);
-  }
-  
   /**
    * Tests OAuth2->grantAccessToken() with checks the redirect URI
    * 
