clean up provider tests

Author: codemasher

tests/Providers/OAuth1ProviderTestAbstract.php

@@ -15,8 +15,6 @@
 use chillerlan\HTTP\{Psr17, Psr7};
 use chillerlan\HTTP\Psr7\{Request, Response};
 use chillerlan\OAuth\Core\{AccessToken, OAuth1Interface, ProviderException};
-use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\{RequestInterface, ResponseInterface};
 
 /**
  * @property \chillerlan\OAuth\Core\OAuth1Interface $provider
@@ -38,21 +36,6 @@ protected function setUp():void{
 
 	}
 
-	/**
-	 * @return \Psr\Http\Client\ClientInterface
-	 */
-	protected function initHttp():ClientInterface{
-		return new class($this->responses, $this->logger) extends ProviderTestHttpClient{
-
-			public function sendRequest(RequestInterface $request):ResponseInterface{
-				$stream = Psr17\create_stream_from_input($this->responses[$request->getUri()->getPath()]);
-
-				return $this->logRequest($request, (new Response)->withBody($stream));
-			}
-
-		};
-	}
-
 	public function testOAuth1Instance(){
 		$this->assertInstanceOf(OAuth1Interface::class, $this->provider);
 	}

tests/Providers/OAuth2ProviderTestAbstract.php

@@ -16,68 +16,28 @@
 use chillerlan\HTTP\Psr7\{Request, Response};
 use chillerlan\OAuth\Core\{AccessToken, ClientCredentials, CSRFToken, OAuth2Interface, ProviderException, TokenRefresh};
 use chillerlan\OAuth\OAuthException;
-use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\{RequestInterface, ResponseInterface};
 
 /**
  * @property \chillerlan\OAuth\Core\OAuth2Interface $provider
  */
 abstract class OAuth2ProviderTestAbstract extends ProviderTestAbstract{
 
 	protected $responses = [
-		'/oauth2/access_token' => [
-			'access_token' => 'test_access_token',
-			'expires_in'   => 3600,
-			'state'        => 'test_state',
-		],
-		'/oauth2/refresh_token' =>  [
-			'access_token' => 'test_refreshed_access_token',
-			'expires_in'   => 60,
-			'state'        => 'test_state',
-		],
-		'/oauth2/client_credentials' => [
-			'access_token' => 'test_client_credentials_token',
-			'expires_in'   => 30,
-			'state'        => 'test_state',
-		],
-		'/oauth2/api/request' => [
-			'data' => 'such data! much wow!'
-		]
+		'/oauth2/access_token'       => '{"access_token":"test_access_token","expires_in":3600,"state":"test_state"}',
+		'/oauth2/refresh_token'      => '{"access_token":"test_refreshed_access_token","expires_in":60,"state":"test_state"}',
+		'/oauth2/client_credentials' => '{"access_token":"test_client_credentials_token","expires_in":30,"state":"test_state"}',
+		'/oauth2/api/request'        => '{"data":"such data! much wow!"}',
 	];
 
 	protected function setUp():void{
 		parent::setUp();
 
 		$this->setProperty($this->provider, 'apiURL', 'https://localhost/oauth2/api');
 		$this->setProperty($this->provider, 'accessTokenURL', 'https://localhost/oauth2/access_token');
+		$this->setProperty($this->provider, 'refreshTokenURL', 'https://localhost/oauth2/refresh_token');
+		$this->setProperty($this->provider, 'clientCredentialsTokenURL', 'https://localhost/oauth2/client_credentials');
 
-		if($this->provider instanceof TokenRefresh){
-			$this->setProperty($this->provider, 'refreshTokenURL', 'https://localhost/oauth2/refresh_token');
-		}
-
-		if($this->provider instanceof ClientCredentials){
-			$this->setProperty($this->provider, 'clientCredentialsTokenURL', 'https://localhost/oauth2/client_credentials');
-		}
-
-		if($this->provider instanceof CSRFToken){
-			$this->storage->storeCSRFState($this->provider->serviceName, 'test_state');
-		}
-
-	}
-
-	/**
-	 * @return \Psr\Http\Client\ClientInterface
-	 */
-	protected function initHttp():ClientInterface{
-		return new class($this->responses, $this->logger) extends ProviderTestHttpClient{
-
-			public function sendRequest(RequestInterface $request):ResponseInterface{
-				$stream = Psr17\create_stream_from_input(json_encode($this->responses[$request->getUri()->getPath()]));
-
-				return $this->logRequest($request, (new Response)->withBody($stream));
-			}
-
-		};
+		$this->storage->storeCSRFState($this->provider->serviceName, 'test_state');
 	}
 
 	public function testOAuth2Instance(){

tests/Providers/ProviderTestAbstract.php

@@ -13,13 +13,18 @@
 namespace chillerlan\OAuthTest\Providers;
 
 use chillerlan\DotEnv\DotEnv;
+use chillerlan\HTTP\Psr18\LoggingClient;
+use chillerlan\HTTP\Psr7\Response;
 use chillerlan\OAuth\{OAuthOptions, Storage\MemoryStorage};
 use chillerlan\OAuth\Core\{AccessToken, OAuthInterface};
 use chillerlan\OAuthTest\OAuthTestLogger;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\{RequestInterface, ResponseInterface};
 use ReflectionClass, ReflectionMethod, ReflectionProperty;
 
+use function chillerlan\HTTP\Psr17\create_stream_from_input;
+
 abstract class ProviderTestAbstract extends TestCase{
 
 	/**
@@ -96,7 +101,28 @@ protected function setUp():void{
 	/**
 	 * @return \Psr\Http\Client\ClientInterface
 	 */
-	abstract protected function initHttp():ClientInterface;
+	protected function initHttp():ClientInterface{
+
+		$client = new class($this->responses) implements ClientInterface{
+
+			/** @var array */
+			protected $responses;
+
+			public function __construct(array $responses){
+				$this->responses = $responses;
+			}
+
+			public function sendRequest(RequestInterface $request):ResponseInterface{
+				$stream = create_stream_from_input($this->responses[$request->getUri()->getPath()]);
+
+				return (new Response)->withBody($stream);
+			}
+
+		};
+
+		return new LoggingClient($client, $this->logger);
+	}
+
 
 	/**
 	 * @return \chillerlan\OAuth\Core\OAuthInterface