Simplify testing callbacks

Author: clue

tests/ConnectionTest.php

@@ -29,12 +29,9 @@ public function testGetRemoteAddress()
 
         $servConn = new Connection($server->master, $loop);
 
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($method->invokeArgs($servConn, array(stream_socket_get_name($master->getValue($server), false))))
-        ;
+        $mock = $this->expectCallableOnceWith(
+            $method->invokeArgs($servConn, array(stream_socket_get_name($master->getValue($server), false)))
+        );
 
         $server->on('connection', function ($conn) use ($mock) {
             $mock($conn->getRemoteAddress());

tests/ServerTest.php

@@ -64,7 +64,7 @@ public function testConnectionWithManyClients()
      * @covers React\EventLoop\StreamSelectLoop::tick
      * @covers React\Socket\Connection::handleData
      */
-    public function testDataWithNoData()
+    public function testDataEventWillNotBeEmittedWhenClientSendsNoData()
     {
         $client = stream_socket_client('tcp://localhost:'.$this->port);
 
@@ -81,17 +81,13 @@ public function testDataWithNoData()
      * @covers React\EventLoop\StreamSelectLoop::tick
      * @covers React\Socket\Connection::handleData
      */
-    public function testData()
+    public function testDataWillBeEmittedWithDataClientSends()
     {
         $client = stream_socket_client('tcp://localhost:'.$this->port);
 
         fwrite($client, "foo\n");
 
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with("foo\n");
+        $mock = $this->expectCallableOnceWith("foo\n");
 
         $this->server->on('connection', function ($conn) use ($mock) {
             $conn->on('data', $mock);
@@ -101,23 +97,16 @@ public function testData()
     }
 
     /**
-     * Test data sent from python language
-     *
      * @covers React\EventLoop\StreamSelectLoop::tick
      * @covers React\Socket\Connection::handleData
      */
-    public function testDataSentFromPy()
+    public function testDataWillBeEmittedEvenWhenClientShutsDownAfterSending()
     {
         $client = stream_socket_client('tcp://localhost:' . $this->port);
         fwrite($client, "foo\n");
         stream_socket_shutdown($client, STREAM_SHUT_WR);
 
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with("foo\n");
-
+        $mock = $this->expectCallableOnceWith("foo\n");
 
         $this->server->on('connection', function ($conn) use ($mock) {
             $conn->on('data', $mock);
@@ -126,17 +115,13 @@ public function testDataSentFromPy()
         $this->loop->tick();
     }
 
-    public function testFragmentedMessage()
+    public function testDataWillBeFragmentedToBufferSize()
     {
         $client = stream_socket_client('tcp://localhost:' . $this->port);
 
         fwrite($client, "Hello World!\n");
 
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with("He");
+        $mock = $this->expectCallableOnceWith("He");
 
         $this->server->on('connection', function ($conn) use ($mock) {
             $conn->bufferSize = 2;
@@ -149,7 +134,7 @@ public function testFragmentedMessage()
     /**
      * @covers React\EventLoop\StreamSelectLoop::tick
      */
-    public function testDisconnectWithoutDisconnect()
+    public function testConnectionDoesNotEndWhenClientDoesNotClose()
     {
         $client = stream_socket_client('tcp://localhost:'.$this->port);
 
@@ -166,7 +151,7 @@ public function testDisconnectWithoutDisconnect()
      * @covers React\EventLoop\StreamSelectLoop::tick
      * @covers React\Socket\Connection::end
      */
-    public function testDisconnect()
+    public function testConnectionDoesEndWhenClientCloses()
     {
         $client = stream_socket_client('tcp://localhost:'.$this->port);
 

tests/TestCase.php

@@ -24,6 +24,17 @@ protected function expectCallableOnce()
         return $mock;
     }
 
+    protected function expectCallableOnceWith($value)
+    {
+        $mock = $this->createCallableMock();
+        $mock
+            ->expects($this->once())
+            ->method('__invoke')
+            ->with($value);
+
+        return $mock;
+    }
+
     protected function expectCallableNever()
     {
         $mock = $this->createCallableMock();