improve test of Request

Vaisonet · Dec 20, 2015 · c9e4dfe · c9e4dfe
1 parent 52ccb90
commit c9e4dfe
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/src/Request/Request.php b/src/Request/Request.php
@@ -5,7 +5,6 @@
 
 
 use GuzzleHttp\Client;
-use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Promise\Promise;
 use GuzzleHttp\Promise\PromiseInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -114,7 +113,7 @@ public function callAsync ($method, $params) {
                 $promise->reject($e);
                 throw $e;
             }
-        }, function (RequestException $reqException) use ($promise, $requestId) {
+        }, function (\Exception $reqException) use ($promise, $requestId) {
             $this->logResponse($requestId, strval($reqException));
             $promise->reject($reqException);
             return $reqException;

diff --git a/tests/Request/RequestTest.php b/tests/Request/RequestTest.php
@@ -75,6 +75,8 @@ public function testEndPoint () {
         $this->assertNull($request->getEndPoint());
         $this->assertSame($request, $request->setEndPoint('endPoint'));
         $this->assertEquals('endPoint', $request->getEndPoint());
+        $request = new Request('', '', '', '', 'endPointBis');
+        $this->assertSame('endPointBis', $request->getEndPoint());
     }
 
     public function testCall () {
@@ -124,4 +126,45 @@ public function testCallAsyncWithRequestError () {
         }
     }
 
+    /**
+     * @expectedException \RuntimeException
+     */
+    public function testCallWithoutEndPoint () {
+        $request = $this->createRequest();
+        $request->call('', []);
+    }
+
+    public function testCallWithoutClientInitialize () {
+        $request = $this->createRequest();
+        $request->setEndPoint('http://github.com');
+        $prop = new \ReflectionProperty($request, 'client');
+        $prop->setAccessible(TRUE);
+        $this->assertNull($prop->getValue($request));
+        try {
+            $request->call('test', [])->wait();
+        } catch (\Exception $e) {
+        }
+        $this->assertInstanceOf(Client::class, $prop->getValue($request));
+    }
+
+    /**
+     * TODO : check that the request is not sent
+     */
+    public function testCancelPromise () {
+        $request = $this->createRequest();
+        $request->setEndPoint('http://github.com');
+        $promise = $request->callAsync('method', []);
+        try {
+            $promise->cancel();
+            $promise->wait();
+        } catch (\Exception $e){
+
+        }
+        $this->assertSame($promise::REJECTED, $promise->getState());
+    }
+
+    public function testErrorResponse() {
+
+    }
+
 }