Merge pull request hkulekci#40 from hkulekci/test-improvement

ServerException changed as extending RuntimeException. And test impro…

Author: hkulekci

src/Exception/ServerException.php

@@ -9,8 +9,9 @@
 namespace Qdrant\Exception;
 
 use Qdrant\Response;
+use RuntimeException;
 
-class ServerException extends \Exception
+class ServerException extends RuntimeException
 {
     protected Response $response;
 

src/Http/GuzzleClient.php

@@ -6,8 +6,7 @@
 namespace Qdrant\Http;
 
 use GuzzleHttp\Client;
-use GuzzleHttp\Exception\ClientException;
-use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Exception\RequestException;
 use JsonException;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\RequestInterface;
@@ -52,15 +51,19 @@ public function execute(RequestInterface $request): Response
     {
         $request = $this->prepareHeaders($request);
         try {
-            $res = $this->client->sendRequest($request);
+            $res = $this->client->send($request);
 
             return new Response($res);
-        } catch (ClientException $e) {
+        } catch (RequestException $e) {
             $statusCode = $e->getResponse()->getStatusCode();
             if ($statusCode >= 400 && $statusCode < 500) {
-                throw new InvalidArgumentException($e->getMessage());
+                $errorResponse = new Response($e->getResponse());
+                throw (new InvalidArgumentException($e->getMessage(), $statusCode))
+                    ->setResponse($errorResponse);
             } elseif ($statusCode >= 500) {
-                throw new ServerException($e->getMessage());
+                $errorResponse = new Response($e->getResponse());
+                throw (new ServerException($e->getMessage(), $statusCode))
+                    ->setResponse($errorResponse);
             }
         }
     }

src/Response.php

@@ -31,14 +31,6 @@ public function __construct(protected ResponseInterface $response)
                 'content' => $response->getBody()->getContents()
             ];
         }
-
-        if ($this->response->getStatusCode() >= 400 && $this->response->getStatusCode() < 500) {
-            throw (new InvalidArgumentException($this->raw['status']['error'] ?? 'Invalid argument exception'))->setResponse($this);
-        }
-
-        if ($this->response->getStatusCode() >= 500 && $this->response->getStatusCode() < 500) {
-            throw (new ServerException())->setResponse($this);
-        }
     }
 
     public function __toArray(): array

tests/Integration/Endpoints/ClusterTest.php

@@ -8,6 +8,7 @@
 
 use Qdrant\Endpoints\Cluster;
 use Qdrant\Exception\InvalidArgumentException;
+use Qdrant\Exception\ServerException;
 use Qdrant\Tests\Integration\AbstractIntegration;
 
 class ClusterTest extends AbstractIntegration
@@ -29,15 +30,12 @@ public function testClusterInfo(): void
      */
     public function testClusterRecover(): void
     {
+        $this->expectException(ServerException::class);
+        $this->expectExceptionMessage('500 Internal Server Error');
+        $this->expectExceptionCode(500);
+
         $cluster = new Cluster($this->client);
         $response = $cluster->recover();
-
-        $this->assertArrayHasKey('status', $response);
-        $this->assertArrayHasKey('time', $response);
-        $this->assertEquals(
-            'Service internal error: Qdrant is running in standalone mode',
-            $response['status']['error']
-        );
     }
 
     /**

tests/Unit/ResponseTest.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * @since     Mar 2023
+ * @author    Haydar KULEKCI <haydarkulekci@gmail.com>
+ */
+
+namespace Qdrant\Tests\Unit;
+
+use GuzzleHttp\Psr7\Response as HttpResponse;
+use GuzzleHttp\Psr7\Utils;
+use PHPUnit\Framework\TestCase;
+use Psr\Http\Message\ResponseInterface;
+use Qdrant\Exception\InvalidArgumentException;
+use Qdrant\Exception\ServerException;
+use Qdrant\Response;
+
+class ResponseTest extends TestCase
+{
+    public function testConstructResponse(): void
+    {
+        $httpResponse = new HttpResponse(
+            200,
+            [
+                'content-type' => 'application/json'
+            ],
+            Utils::streamFor(json_encode(['foo' => 'bar']))
+        );
+
+        $response = new Response($httpResponse);
+
+        $this->assertEquals('bar', $response['foo']);
+    }
+
+    public function testConstructResponse2(): void
+    {
+        $httpResponse = new HttpResponse(
+            200,
+            [
+                'content-type' => 'text/html'
+            ],
+            Utils::streamFor(json_encode(['foo' => 'bar']))
+        );
+
+        $response = new Response($httpResponse);
+
+        $this->assertEquals('{"foo":"bar"}', $response['content']);
+    }
+
+    public function testConstructResponseWith4xxHttpCode(): void
+    {
+        $httpResponse = new HttpResponse(
+            418,
+            [
+                'content-type' => 'application/json'
+            ],
+            Utils::streamFor(json_encode(['foo' => 'bar']))
+        );
+
+        $response = new Response($httpResponse);
+        $this->assertEquals('bar', $response['foo']);
+    }
+
+    public function testConstructResponseWith5xxHttpCode(): void
+    {
+        $httpResponse = new HttpResponse(
+            510,
+            [],
+            Utils::streamFor(json_encode(['foo' => 'bar']))
+        );
+
+        $response = new Response($httpResponse);
+        $this->assertEquals('{"foo":"bar"}', $response['content']);
+    }
+}