Merge pull request #119 from SammyK/test-cleanup

Fosco Marotto · Fosco Marotto · commit c9d0671861bd · 2014-06-16T10:49:47.000-07:00
Added test user garbage collection to test suite
diff --git a/src/Facebook/FacebookRequest.php b/src/Facebook/FacebookRequest.php
@@ -86,6 +86,11 @@ class FacebookRequest
    */
   private static $httpClientHandler;
 
+  /**
+   * @var int The number of calls that have been made to Graph.
+   */
+  public static $requestCount = 0;
+
   /**
    * getSession - Returns the associated FacebookSession.
    *
@@ -242,6 +247,8 @@ public function execute()
     // Don't catch to allow it to bubble up.
     $result = $connection->send($url, $this->method, $params);
 
+    static::$requestCount++;
+
     $etagHit = 304 == $connection->getResponseHttpStatusCode();
 
     $headers = $connection->getResponseHeaders();
diff --git a/tests/FacebookCanvasLoginHelperTest.php b/tests/FacebookCanvasLoginHelperTest.php
@@ -6,16 +6,6 @@
 class FacebookCanvasLoginHelperTest extends PHPUnit_Framework_TestCase
 {
 
-  public static function setUpBeforeClass()
-  {
-    FacebookTestHelper::setUpBeforeClass();
-  }
-
-  public static function tearDownAfterClass()
-  {
-
-  }
-
   public function testGetSessionFromCanvasGET() {
     $helper = new FacebookCanvasLoginHelper();
     $signedRequest = FacebookSessionTest::makeSignedRequest(array(
diff --git a/tests/FacebookJavaScriptLoginHelperTest.php b/tests/FacebookJavaScriptLoginHelperTest.php
@@ -6,16 +6,6 @@
 class FacebookJavaScriptLoginHelperTest extends PHPUnit_Framework_TestCase
 {
 
-  public static function setUpBeforeClass()
-  {
-    FacebookTestHelper::setUpBeforeClass();
-  }
-
-  public static function tearDownAfterClass()
-  {
-
-  }
-
   public function testGetSessionFromCookie() {
     $helper = new FacebookJavaScriptLoginHelper(
       FacebookTestCredentials::$appId
@@ -28,4 +18,5 @@ public function testGetSessionFromCookie() {
     $this->assertTrue($session instanceof FacebookSession);
     $this->assertTrue($session->getToken() == 'token');
   }
+
 }
diff --git a/tests/FacebookPageTabHelperTest.php b/tests/FacebookPageTabHelperTest.php
@@ -6,16 +6,6 @@
 class FacebookPageTabHelperTest extends PHPUnit_Framework_TestCase
 {
 
-  public static function setUpBeforeClass()
-  {
-    FacebookTestHelper::setUpBeforeClass();
-  }
-
-  public static function tearDownAfterClass()
-  {
-
-  }
-
   public function testGetSessionFromPageTabGET() {
     $signedRequest = FacebookSessionTest::makeSignedRequest(array(
       'oauth_token' => 'token',
@@ -72,4 +62,4 @@ public function testLoggedOutPageTab() {
     $this->assertEquals(42, $helper->getPageId());
   }
 
-}
+}
diff --git a/tests/FacebookRedirectLoginHelperTest.php b/tests/FacebookRedirectLoginHelperTest.php
@@ -8,11 +8,6 @@ class FacebookRedirectLoginHelperTest extends PHPUnit_Framework_TestCase
 
   const REDIRECT_URL = 'http://invalid.zzz';
 
-  public static function setUpBeforeClass()
-  {
-    FacebookTestHelper::setUpBeforeClass();
-  }
-
   public function testLoginURL()
   {
     $helper = new FacebookRedirectLoginHelper(
@@ -63,4 +58,4 @@ public function testLogoutURL()
     }
   }
 
-}
+}
diff --git a/tests/FacebookRequestExceptionTest.php b/tests/FacebookRequestExceptionTest.php
@@ -12,11 +12,6 @@
 class FacebookRequestExceptionTest extends PHPUnit_Framework_TestCase
 {
 
-  public static function setUpBeforeClass()
-  {
-    FacebookTestHelper::setUpBeforeClass();
-  }
-
   public function testAuthorizationExceptions()
   {
     $params = array(
@@ -268,4 +263,4 @@ public function testInvalidCredentialsException()
     $bogusSession->validate('invalid-app-id', 'invalid-app-secret');
   }
 
-}
+}
diff --git a/tests/FacebookRequestTest.php b/tests/FacebookRequestTest.php
@@ -6,11 +6,6 @@
 class FacebookRequestTest extends PHPUnit_Framework_TestCase
 {
 
-  public static function setUpBeforeClass()
-  {
-    FacebookTestHelper::setUpBeforeClass();
-  }
-
   public function testGetsTheLoggedInUsersProfile()
   {
     $response = (
diff --git a/tests/FacebookSessionTest.php b/tests/FacebookSessionTest.php
@@ -6,11 +6,6 @@
 class FacebookSessionTest extends PHPUnit_Framework_TestCase
 {
 
-  public static function setUpBeforeClass()
-  {
-    FacebookTestHelper::setUpBeforeClass();
-  }
-
   public function testSessionToken()
   {
     $session = new FacebookSession(FacebookTestHelper::getAppToken());
diff --git a/tests/FacebookTestHelper.php b/tests/FacebookTestHelper.php
@@ -4,24 +4,13 @@
 use Facebook\FacebookRequest;
 use Facebook\FacebookSDKException;
 
-// Uncomment two lines to force functional test curl implementation
-//use Facebook\HttpClients\FacebookCurlHttpClient;
-//FacebookRequest::setHttpClientHandler(new FacebookCurlHttpClient());
-
-// Uncomment two lines to force functional test stream wrapper implementation
-//use Facebook\HttpClients\FacebookStreamHttpClient;
-//FacebookRequest::setHttpClientHandler(new FacebookStreamHttpClient());
-
-// Uncomment two lines to force functional test Guzzle implementation
-//use Facebook\HttpClients\FacebookGuzzleHttpClient;
-//FacebookRequest::setHttpClientHandler(new FacebookGuzzleHttpClient());
-
 class FacebookTestHelper
 {
 
   public static $testSession;
+  protected static $testUserId;
 
-  public static function setUpBeforeClass()
+  public static function initialize()
   {
     if (!strlen(FacebookTestCredentials::$appId) ||
       !strlen(FacebookTestCredentials::$appSecret)) {
@@ -32,47 +21,53 @@ public static function setUpBeforeClass()
     FacebookSession::setDefaultApplication(
       FacebookTestCredentials::$appId, FacebookTestCredentials::$appSecret
     );
-    if (!(static::$testSession instanceof FacebookSession)) {
+    if (!static::$testSession instanceof FacebookSession) {
       static::$testSession = static::createTestSession();
     }
   }
 
-  public static function setUp()
+  public static function createTestSession()
   {
-
+    $accessToken = static::createTestUserAndGetAccessToken();
+    return new FacebookSession($accessToken);
   }
 
-  public static function tearDownAfterClass()
+  public static function createTestUserAndGetAccessToken()
   {
+    $testUserPath = '/' . FacebookTestCredentials::$appId . '/accounts/test-users';
+    $params = array(
+      'installed' => true,
+      'name' => 'Foo Phpunit User',
+      'locale' => 'en_US',
+      'permissions' => 'read_stream,user_photos',
+    );
 
-  }
+    $request = new FacebookRequest(static::getAppSession(), 'POST', $testUserPath, $params);
+    $response = $request->execute()->getGraphObject();
 
-  public static function tearDown()
-  {
+    static::$testUserId = $response->getProperty('id');
 
+    return $response->getProperty('access_token');
   }
 
-  public static function createTestSession()
+  public static function getAppSession()
   {
-    $testUserPath = '/' . FacebookTestCredentials::$appId . '/accounts/test-users';
-    $params = array(
-      'installed' => true,
-      'name' => 'PHPUnitTestUser',
-      'locale' => 'en_US',
-      'permissions' => 'read_stream, user_photos',
-      'method' => 'post'
-    );
-    $response = (new FacebookRequest(
-      new FacebookSession(FacebookTestHelper::getAppToken()),
-      'GET',
-      $testUserPath,
-      $params))->execute()->getGraphObject();
-    return new FacebookSession($response->getProperty('access_token'));
+    return new FacebookSession(static::getAppToken());
   }
 
   public static function getAppToken()
   {
     return FacebookTestCredentials::$appId . '|' . FacebookTestCredentials::$appSecret;
   }
 
-}
+  public static function deleteTestUser()
+  {
+    if (!static::$testUserId) {
+      return;
+    }
+    $testUserPath = '/' . static::$testUserId;
+    $request = new FacebookRequest(static::getAppSession(), 'DELETE', $testUserPath);
+    $request->execute();
+  }
+
+}
diff --git a/tests/GraphAlbumTest.php b/tests/GraphAlbumTest.php
@@ -5,14 +5,10 @@
 
 class GraphAlbumTest extends PHPUnit_Framework_TestCase
 {
+
   const ALBUM_DESCRIPTION = "Album Description";
   const ALBUM_NAME = "Album Name";
 
-  public static function setUpBeforeClass()
-  {
-    FacebookTestHelper::setUpBeforeClass();
-  }
-
   public function testMeReturnsGraphAlbum()
   {
     $response = (
@@ -53,4 +49,5 @@ public function testMeReturnsGraphAlbum()
     $this->assertTrue($response->getCreatedTime() instanceof DateTime);
     $this->assertTrue($response->getUpdatedTime() instanceof DateTime);
   }
-}
+
+}
diff --git a/tests/GraphLocationTest.php b/tests/GraphLocationTest.php
@@ -3,16 +3,10 @@
 use Facebook\FacebookRequest;
 use Facebook\GraphLocation;
 use Facebook\GraphObject;
-use Facebook\FacebookSession;
 
 class GraphLocationTest extends PHPUnit_Framework_TestCase
 {
 
-  public static function setUpBeforeClass()
-  {
-    FacebookTestHelper::setUpBeforeClass();
-  }
-
   public function testLocation()
   {
     $response = (
@@ -28,4 +22,4 @@ public function testLocation()
     $this->assertTrue(is_float($location->getLongitude()));
   }
 
-}
+}
diff --git a/tests/GraphObjectTest.php b/tests/GraphObjectTest.php
@@ -8,11 +8,6 @@
 class GraphObjectTest extends PHPUnit_Framework_TestCase
 {
 
-  public static function setUpBeforeClass()
-  {
-    FacebookTestHelper::setUpBeforeClass();
-  }
-
   public function testFriends()
   {
     $response = (
@@ -99,4 +94,4 @@ public function testAsList()
     $this->assertEquals('Fosco', $list[1]->getName());
   }
 
-}
+}
diff --git a/tests/GraphSessionInfoTest.php b/tests/GraphSessionInfoTest.php
@@ -7,11 +7,6 @@
 class GraphSessionInfoTest extends PHPUnit_Framework_TestCase
 {
 
-  public static function setUpBeforeClass()
-  {
-    FacebookTestHelper::setUpBeforeClass();
-  }
-
   public function testSessionInfo()
   {
     $params = array(
@@ -28,4 +23,4 @@ public function testSessionInfo()
     $this->assertTrue($response->isValid());
   }
 
-}
+}
diff --git a/tests/GraphUserTest.php b/tests/GraphUserTest.php
@@ -2,16 +2,10 @@
 
 use Facebook\FacebookRequest;
 use Facebook\GraphUser;
-use Facebook\FacebookSession;
 
 class GraphUserTest extends PHPUnit_Framework_TestCase
 {
 
-  public static function setUpBeforeClass()
-  {
-    FacebookTestHelper::setUpBeforeClass();
-  }
-
   public function testMeReturnsGraphUser()
   {
     $response = (
@@ -30,4 +24,4 @@ public function testMeReturnsGraphUser()
     $this->assertNotNull($response->getLink());
   }
 
-}
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -13,5 +13,23 @@
 require_once __DIR__ . '/FacebookTestCredentials.php';
 require_once __DIR__ . '/FacebookTestHelper.php';
 
-$baseDir = str_replace('/tests', '', __DIR__);
-define('APPLICATION_PATH', $baseDir);
+// Uncomment two lines to force functional test curl implementation
+//use Facebook\HttpClients\FacebookCurlHttpClient;
+//FacebookRequest::setHttpClientHandler(new FacebookCurlHttpClient());
+
+// Uncomment two lines to force functional test stream wrapper implementation
+//use Facebook\HttpClients\FacebookStreamHttpClient;
+//FacebookRequest::setHttpClientHandler(new FacebookStreamHttpClient());
+
+// Uncomment two lines to force functional test Guzzle implementation
+//use Facebook\HttpClients\FacebookGuzzleHttpClient;
+//FacebookRequest::setHttpClientHandler(new FacebookGuzzleHttpClient());
+
+// Create a temp test user to use for testing
+FacebookTestHelper::initialize();
+
+// Delete the temp test user after all tests have fired
+register_shutdown_function(function ()
+{
+  FacebookTestHelper::deleteTestUser();
+});

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,6 @@ class FacebookRedirectLoginHelperTest extends PHPUnit_Framework_TestCase`
`8`	`8`
`9`	`9`	`const REDIRECT_URL = 'http://invalid.zzz';`
`10`	`10`
`11`		`- public static function setUpBeforeClass()`
`12`		`- {`
`13`		`- FacebookTestHelper::setUpBeforeClass();`
`14`		`- }`
`15`		`-`
`16`	`11`	`public function testLoginURL()`
`17`	`12`	`{`
`18`	`13`	`$helper = new FacebookRedirectLoginHelper(`
`@@ -63,4 +58,4 @@ public function testLogoutURL()`
`63`	`58`	`}`
`64`	`59`	`}`
`65`	`60`
`66`		`-}`
	`61`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,6 @@`
`12`	`12`	`class FacebookRequestExceptionTest extends PHPUnit_Framework_TestCase`
`13`	`13`	`{`
`14`	`14`
`15`		`- public static function setUpBeforeClass()`
`16`		`- {`
`17`		`- FacebookTestHelper::setUpBeforeClass();`
`18`		`- }`
`19`		`-`
`20`	`15`	`public function testAuthorizationExceptions()`
`21`	`16`	`{`
`22`	`17`	`$params = array(`
`@@ -268,4 +263,4 @@ public function testInvalidCredentialsException()`
`268`	`263`	`$bogusSession->validate('invalid-app-id', 'invalid-app-secret');`
`269`	`264`	`}`
`270`	`265`
`271`		`-}`
	`266`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,6 @@`
`6`	`6`	`class FacebookRequestTest extends PHPUnit_Framework_TestCase`
`7`	`7`	`{`
`8`	`8`
`9`		`- public static function setUpBeforeClass()`
`10`		`- {`
`11`		`- FacebookTestHelper::setUpBeforeClass();`
`12`		`- }`
`13`		`-`
`14`	`9`	`public function testGetsTheLoggedInUsersProfile()`
`15`	`10`	`{`
`16`	`11`	`$response = (`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,6 @@`
`6`	`6`	`class FacebookSessionTest extends PHPUnit_Framework_TestCase`
`7`	`7`	`{`
`8`	`8`
`9`		`- public static function setUpBeforeClass()`
`10`		`- {`
`11`		`- FacebookTestHelper::setUpBeforeClass();`
`12`		`- }`
`13`		`-`
`14`	`9`	`public function testSessionToken()`
`15`	`10`	`{`
`16`	`11`	`$session = new FacebookSession(FacebookTestHelper::getAppToken());`