From 0fcbeb8158dadac2da10ddd1db79a34db8c0cce4 Mon Sep 17 00:00:00 2001 From: Alex Bilbie Date: Sun, 23 Dec 2012 22:13:22 +0000 Subject: [PATCH] PSR fixes --- tests/resource/server_test.php | 177 +++++++++++++++++---------------- 1 file changed, 90 insertions(+), 87 deletions(-) diff --git a/tests/resource/server_test.php b/tests/resource/server_test.php index 7feb4389..707d73ee 100644 --- a/tests/resource/server_test.php +++ b/tests/resource/server_test.php @@ -2,120 +2,123 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase { - function setUp() - { - require_once('database_mock.php'); - $this->server = new Oauth2\Resource\Server(); - $this->db = new ResourceDB(); + function setUp() + { + require_once 'src/OAuth2/Resource/Server.php'; + require_once 'src/OAuth2/Resource/Database.php'; - $this->assertInstanceOf('Oauth2\Resource\Database', $this->db); - $this->server->registerDbAbstractor($this->db); - } + require_once('database_mock.php'); + $this->server = new Oauth2\Resource\Server(); + $this->db = new ResourceDB(); - function test_init_POST() - { - $_SERVER['REQUEST_METHOD'] = 'POST'; - $_POST['oauth_token'] = 'test12345'; + $this->assertInstanceOf('Oauth2\Resource\Database', $this->db); + $this->server->registerDbAbstractor($this->db); + } - $this->server->init(); + function test_init_POST() + { + $_SERVER['REQUEST_METHOD'] = 'POST'; + $_POST['oauth_token'] = 'test12345'; - $reflector = new ReflectionClass($this->server); + $this->server->init(); - $_accessToken = $reflector->getProperty('_accessToken'); - $_accessToken->setAccessible(true); + $reflector = new ReflectionClass($this->server); - $_type = $reflector->getProperty('_type'); - $_type->setAccessible(true); + $_accessToken = $reflector->getProperty('_accessToken'); + $_accessToken->setAccessible(true); - $_typeId = $reflector->getProperty('_typeId'); - $_typeId->setAccessible(true); + $_type = $reflector->getProperty('_type'); + $_type->setAccessible(true); - $_scopes = $reflector->getProperty('_scopes'); - $_scopes->setAccessible(true); + $_typeId = $reflector->getProperty('_typeId'); + $_typeId->setAccessible(true); - $this->assertEquals($_accessToken->getValue($this->server), $_POST['oauth_token']); - $this->assertEquals($_type->getValue($this->server), 'user'); - $this->assertEquals($_typeId->getValue($this->server), 123); - $this->assertEquals($_scopes->getValue($this->server), array('foo', 'bar')); - } + $_scopes = $reflector->getProperty('_scopes'); + $_scopes->setAccessible(true); - function test_init_GET() - { - $_GET['oauth_token'] = 'test12345'; + $this->assertEquals($_accessToken->getValue($this->server), $_POST['oauth_token']); + $this->assertEquals($_type->getValue($this->server), 'user'); + $this->assertEquals($_typeId->getValue($this->server), 123); + $this->assertEquals($_scopes->getValue($this->server), array('foo', 'bar')); + } - $this->server->init(); + function test_init_GET() + { + $_GET['oauth_token'] = 'test12345'; - $reflector = new ReflectionClass($this->server); + $this->server->init(); - $_accessToken = $reflector->getProperty('_accessToken'); - $_accessToken->setAccessible(true); + $reflector = new ReflectionClass($this->server); - $_type = $reflector->getProperty('_type'); - $_type->setAccessible(true); + $_accessToken = $reflector->getProperty('_accessToken'); + $_accessToken->setAccessible(true); - $_typeId = $reflector->getProperty('_typeId'); - $_typeId->setAccessible(true); + $_type = $reflector->getProperty('_type'); + $_type->setAccessible(true); - $_scopes = $reflector->getProperty('_scopes'); - $_scopes->setAccessible(true); + $_typeId = $reflector->getProperty('_typeId'); + $_typeId->setAccessible(true); - $this->assertEquals($_accessToken->getValue($this->server), $_GET['oauth_token']); - $this->assertEquals($_type->getValue($this->server), 'user'); - $this->assertEquals($_typeId->getValue($this->server), 123); - $this->assertEquals($_scopes->getValue($this->server), array('foo', 'bar')); - } + $_scopes = $reflector->getProperty('_scopes'); + $_scopes->setAccessible(true); - function test_init_header() - { - // Test with authorisation header - $this->markTestIncomplete('Authorisation header test has not been implemented yet.'); - } + $this->assertEquals($_accessToken->getValue($this->server), $_GET['oauth_token']); + $this->assertEquals($_type->getValue($this->server), 'user'); + $this->assertEquals($_typeId->getValue($this->server), 123); + $this->assertEquals($_scopes->getValue($this->server), array('foo', 'bar')); + } - /** - * @expectedException \Oauth2\Resource\ClientException - * @expectedExceptionMessage An access token was not presented with the request - */ - function test_init_missingToken() - { - $this->server->init(); - } + function test_init_header() + { + // Test with authorisation header + $this->markTestIncomplete('Authorisation header test has not been implemented yet.'); + } - /** - * @expectedException \Oauth2\Resource\ClientException - * @expectedExceptionMessage The access token is not registered with the resource server - */ - function test_init_wrongToken() - { - $_POST['oauth_token'] = 'blah'; - $_SERVER['REQUEST_METHOD'] = 'POST'; + /** + * @expectedException \Oauth2\Resource\ClientException + * @expectedExceptionMessage An access token was not presented with the request + */ + function test_init_missingToken() + { + $this->server->init(); + } - $this->server->init(); - } + /** + * @expectedException \Oauth2\Resource\ClientException + * @expectedExceptionMessage The access token is not registered with the resource server + */ + function test_init_wrongToken() + { + $_POST['oauth_token'] = 'blah'; + $_SERVER['REQUEST_METHOD'] = 'POST'; - function test_hasScope() - { - $_POST['oauth_token'] = 'test12345'; - $_SERVER['REQUEST_METHOD'] = 'POST'; + $this->server->init(); + } - $this->server->init(); + function test_hasScope() + { + $_POST['oauth_token'] = 'test12345'; + $_SERVER['REQUEST_METHOD'] = 'POST'; - $this->assertEquals(true, $this->server->hasScope('foo')); - $this->assertEquals(true, $this->server->hasScope('bar')); - $this->assertEquals(true, $this->server->hasScope(array('foo', 'bar'))); + $this->server->init(); - $this->assertEquals(false, $this->server->hasScope('foobar')); - $this->assertEquals(false, $this->server->hasScope(array('foobar'))); - } + $this->assertEquals(true, $this->server->hasScope('foo')); + $this->assertEquals(true, $this->server->hasScope('bar')); + $this->assertEquals(true, $this->server->hasScope(array('foo', 'bar'))); - function test___call() - { - $_POST['oauth_token'] = 'test12345'; - $_SERVER['REQUEST_METHOD'] = 'POST'; + $this->assertEquals(false, $this->server->hasScope('foobar')); + $this->assertEquals(false, $this->server->hasScope(array('foobar'))); + } - $this->server->init(); + function test___call() + { + $_POST['oauth_token'] = 'test12345'; + $_SERVER['REQUEST_METHOD'] = 'POST'; - $this->assertEquals(123, $this->server->isUser()); - $this->assertEquals(false, $this->server->isMachine()); - } + $this->server->init(); + + $this->assertEquals(123, $this->server->isUser()); + $this->assertEquals(false, $this->server->isMachine()); + } } \ No newline at end of file