Replace unreliable functional test with simpler unit tests

Author: clue

tests/IntegrationTest.php

@@ -167,20 +167,4 @@ public function testSelfSignedResolvesIfVerificationIsDisabled()
         // if we reach this, then everything is good
         $this->assertNull(null);
     }
-
-    public function testCancelPendingConnection()
-    {
-        $loop = Factory::create();
-
-        $connector = new TcpConnector($loop);
-        $pending = $connector->connect('8.8.8.8:80');
-
-        $loop->addTimer(0.001, function () use ($pending) {
-            $pending->cancel();
-        });
-
-        $pending->then($this->expectCallableNever(), $this->expectCallableOnce());
-
-        $loop->run();
-    }
 }

tests/TcpConnectorTest.php

@@ -24,6 +24,24 @@ public function connectionToEmptyPortShouldFail()
         $loop->run();
     }
 
+    /** @test */
+    public function connectionToTcpServerShouldAddResourceToLoop()
+    {
+        $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+        $connector = new TcpConnector($loop);
+
+        $server = new TcpServer(0, $loop);
+
+        $valid = false;
+        $loop->expects($this->once())->method('addWriteStream')->with($this->callback(function ($arg) use (&$valid) {
+            $valid = is_resource($arg);
+            return true;
+        }));
+        $connector->connect($server->getAddress());
+
+        $this->assertTrue($valid);
+    }
+
     /** @test */
     public function connectionToTcpServerShouldSucceed()
     {
@@ -196,6 +214,30 @@ public function connectionToInvalidSchemeShouldFailImmediately()
         );
     }
 
+    /** @test */
+    public function cancellingConnectionShouldRemoveResourceFromLoopAndCloseResource()
+    {
+        $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+        $connector = new TcpConnector($loop);
+
+        $server = new TcpServer(0, $loop);
+
+        $loop->expects($this->once())->method('addWriteStream');
+        $promise = $connector->connect($server->getAddress());
+
+        $resource = null;
+        $valid = false;
+        $loop->expects($this->once())->method('removeWriteStream')->with($this->callback(function ($arg) use (&$resource, &$valid) {
+            $resource = $arg;
+            $valid = is_resource($arg);
+            return true;
+        }));
+        $promise->cancel();
+
+        $this->assertTrue($valid);
+        $this->assertFalse(is_resource($resource));
+    }
+
     /** @test */
     public function cancellingConnectionShouldRejectPromise()
     {