@@ -332,7 +332,8 @@ class EpiOAuthResponse
}
}
-class EpiOAuthException extends Exception
+class EpiException extends Exception{}
+class EpiOAuthException extends EpiException
{
public static function raise($message, $code)
{
@@ -347,7 +348,5 @@ class EpiOAuthException extends Exception
}
}
}
-
-
class EpiOAuthBadRequestException extends EpiOAuthException{}
class EpiOAuthUnauthorizedException extends EpiOAuthException{}
EpiOAuth.php
@@ -131,19 +131,11 @@ class EpiTwitterJson implements ArrayAccess, Countable, IteratorAggregate
public function __get($name)
{
- if(($this->__resp->code < 200 || $this->__resp->code >= 400) && $name !== 'responseText' && $name !== 'headers') // TODO: clean up
- {
- switch($this->__auth)
- {
- case EpiTwitter::EPITWITTER_AUTH_OAUTH:
- EpiOAuthException::raise($this->__resp->data, $this->__resp->code);
- case EpiTwitter::EPITWITTER_AUTH_BASIC:
- throw new EpiTwitterException($this->__resp->data, $this->__resp->code);
- default:
- throw new Exception("Unknown EpiTwitter Exception. Response: {$this->__resp->data}", $this->__resp->code);
- }
- }
+ $accessible = array('responseText'=>1,'headers'=>1);
+ if(($this->__resp->code < 200 || $this->__resp->code >= 400) && !isset($accessible[$name]))
+ EpiTwitterException::raise($this->__resp);
+ // if no exception is thrown, continue
$this->responseText = $this->__resp->data;
$this->code = $this->__resp->code;
$this->headers = $this->__resp->headers;
@@ -168,4 +160,29 @@ class EpiTwitterJson implements ArrayAccess, Countable, IteratorAggregate
}
}
-class EpiTwitterException extends Exception {}
+class EpiTwitterException extends EpiException
+{
+ public static function raise($response)
+ {
+ $message = "An exception occurred in EpiTwitter\n"
+ . "The response is {$response->data}\n"
+ . "The headers are " . print_r($response->headers, true) . "\n";
+ switch($response->code)
+ {
+ case 400:
+ throw new EpiTwitterBadRequestException($message, $response->code);
+ case 401:
+ throw new EpiTwitterNotAuthorizedException($message, $response->code);
+ case 403:
+ throw new EpiTwitterForbiddenException($message, $response->code);
+ case 404:
+ throw new EpiTwitterNotFoundException($message, $response->code);
+ default:
+ throw new EpiTwitterException($message, $response->code);
+ }
+ }
+}
+class EpiTwitterBadRequestException extends EpiTwitterException{}
+class EpiTwitterNotAuthorizedException extends EpiTwitterException{}
+class EpiTwitterForbiddenException extends EpiTwitterException{}
+class EpiTwitterNotFoundException extends EpiTwitterException{}
EpiTwitter.php
@@ -16,6 +16,7 @@ class EpiTwitterTest extends PHPUnit_Framework_TestCase
$this->twitterObj = new EpiTwitter($consumer_key, $consumer_secret, $token, $secret);
$this->twitterObjUnAuth = new EpiTwitter($consumer_key, $consumer_secret);
$this->twitterObjBasic = new EpiTwitter();
+ $this->twitterObjBadAuth = new EpiTwitter('foo', 'bar', 'foo', 'bar');
$this->id = '25451974';
$this->screenName = 'jmathai_test';
$this->twitterUsername = 'jmathai_test';
@@ -121,16 +122,6 @@ class EpiTwitterTest extends PHPUnit_Framework_TestCase
$this->assertEquals($token->oauth_token, substr($authenticateUrl, (strpos($authenticateUrl, '=')+1)), "token does not equal the one which was passed in");
}
- /**
- * @expectedException EpiOAuthException
- */
- function testNoRequiredParameter()
- {
- $resp = $this->twitterObj->post_direct_messagesNew( array ( 'user' => $this->screenName, 'text' => ''));
- $this->assertTrue(!empty($resp->response['error']), "An empty direct message should return an error message");
-
- }
-
function testResponseAccess()
{
$resp = $this->twitterObj->get_statusesFollowers();
@@ -301,4 +292,31 @@ class EpiTwitterTest extends PHPUnit_Framework_TestCase
$resp = $this->twitterObj->get_statusesFollowers();
$this->assertTrue(!empty($resp->headers['Status']), 'header status response should not be empty');
}
+
+ /**
+ * @expectedException EpiTwitterForbiddenException
+ */
+ function testNoRequiredParameter()
+ {
+ $resp = $this->twitterObj->post_direct_messagesNew( array ( 'user' => $this->screenName, 'text' => ''));
+ $this->assertTrue(!empty($resp->response['error']), "An empty direct message should return an error message");
+ }
+
+ /**
+ * @expectedException EpiTwitterNotAuthorizedException
+ */
+ function testBadCredentials()
+ {
+ $resp = $this->twitterObjBadAuth->post_direct_messagesNew( array ( 'user' => $this->screenName, 'text' => 'hello world'));
+ $this->assertTrue(!empty($resp->response['error']), "Bad credentials should return a not authorized exception");
+ }
+
+ /**
+ * @expectedException EpiTwitterNotFoundException
+ */
+ function testNonExistantUser()
+ {
+ $resp = $this->twitterObj->post_direct_messagesNew( array ( 'user' => 'jaisen_does_not_exist_and_dont_create_or_this_will_break', 'text' => 'seriously'));
+ $this->assertTrue(!empty($resp->response['error']), "Sending a message to a user that doesn't exist should return a 404");
+ }
}
tests/EpiTwitterTest.php
889fee8f89fe1d19013cc8a08a8dbae724c14b41
Jaisen Mathai
jaisen@jmathai.com
http://github.com/jmathai/twitter-async/commit/42934e1d8e7144906b18947309f9e25e84d53461
42934e1d8e7144906b18947309f9e25e84d53461
2009-10-05T18:21:09-07:00
2009-10-05T18:21:09-07:00
Initial checkin of exception refactoring. gh-18
f03353d19ef21435bc9b033b2e42b3823c893b8b
Jaisen Mathai
jaisen@jmathai.com