Update a unit test

Author: Eugene Leonovich

src/Queue.php

@@ -21,20 +21,21 @@ public function __construct(\Tarantool $client, $tubeName)
      */
     public function put($data, array $options = null)
     {
-        $result = $this->client->call($this->prefix.'put', [$data, (array) $options]);
+        $args = $options ? [$data, $options] : [$data];
+        $result = $this->client->call($this->prefix.'put', $args);
 
         return Task::createFromTuple($result[0]);
     }
 
     /**
-     * @param int|null $timeout
+     * @param float|null $timeout
      *
      * @return Task|null
      */
     public function take($timeout = null)
     {
-        $options = null === $timeout ? [] : [(float) $timeout];
-        $result = $this->client->call($this->prefix.'take', $options);
+        $args = null === $timeout ? [] : [$timeout];
+        $result = $this->client->call($this->prefix.'take', $args);
 
         return empty($result[0]) ? null : Task::createFromTuple($result[0]);
     }
@@ -59,7 +60,8 @@ public function ack($taskId)
      */
     public function release($taskId, array $options = null)
     {
-        $result = $this->client->call($this->prefix.'release', [$taskId, (array) $options]);
+        $args = $options ? [$taskId, $options] : [$taskId];
+        $result = $this->client->call($this->prefix.'release', $args);
 
         return Task::createFromTuple($result[0]);
     }

tests/Unit/QueueTest.php

@@ -3,48 +3,52 @@
 namespace Tarantool\Queue\Tests\Unit;
 
 use Tarantool\Queue\Queue;
+use Tarantool\Queue\Task;
 
 class QueueTest extends \PHPUnit_Framework_TestCase
 {
-    private $tarantool;
+    private $client;
     private $queue;
 
     protected function setUp()
     {
-        $this->tarantool = $this->getMock('Tarantool');
-        $this->queue = new Queue($this->tarantool, 'foo');
+        $this->client = $this->getMock('Tarantool');
+        $this->queue = new Queue($this->client, 'foo');
     }
 
     /**
      * @dataProvider provideCallData
      */
-    public function testClientCall($functionName, array $args, $returnValue, $hasEmptyOptions = false)
+    public function testMethod($functionName, array $args, array $tuple, $result)
     {
-        $this->tarantool->expects($this->once())->method('call')
-            ->with("queue.tube.foo:$functionName",
-                $hasEmptyOptions ? $this->logicalOr(
-                    $this->equalTo($args + [1 => []]),
-                    $this->equalTo($args)
-                ) : $args
-            )
-            ->will($this->returnValue([$returnValue]));
-
-        call_user_func_array([$this->queue, $functionName], $args);
+        $this->client->expects($this->once())->method('call')
+            ->with("queue.tube.foo:$functionName", $args)
+            ->will($this->returnValue([$tuple]));
+
+        $actualResult = call_user_func_array([$this->queue, $functionName], $args);
+
+        is_object($result)
+            ? $this->assertEquals($result, $actualResult)
+            : $this->assertSame($result, $actualResult);
     }
 
     public function provideCallData()
     {
+        $tuple = [1, 'x', 42];
+        $task = Task::createFromTuple($tuple);
+
         return [
-            ['put', [42], [1, 0], true],
-            ['put', [42, ['delay' => 2]], [1, 0]],
-            ['take', [1], [1, 0]],
-            ['ack', [1], [1, 0]],
-            ['release', [1], [1, 0], true],
-            ['release', [1, ['delay' => 2]], [1, 0]],
-            ['peek', [1], [1, 0]],
-            ['bury', [1], [1, 0]],
-            ['kick', [5], 5],
-            ['delete', [1], [1, 0]],
+            ['put', [42], $tuple, $task],
+            ['put', [42, ['delay' => 2]], $tuple, $task],
+            ['take', [], $tuple, $task],
+            ['take', [.1], $tuple, $task],
+            ['ack', [1], $tuple, $task],
+            ['release', [1], $tuple, $task],
+            ['release', [1, ['delay' => 2]], $tuple, $task],
+            ['peek', [1], $tuple, $task],
+            ['bury', [1], $tuple, $task],
+            ['kick', [5], [5], 5],
+            ['delete', [1], $tuple, $task],
         ];
     }
 }