Update tests to use EventLoop Factory instead of StreamSelectLoop

Author: clue

tests/FunctionalConnectorTest.php

@@ -3,9 +3,9 @@
 namespace React\Tests\Socket;
 
 use Clue\React\Block;
-use React\EventLoop\StreamSelectLoop;
-use React\Socket\TcpServer;
+use React\EventLoop\Factory;
 use React\Socket\Connector;
+use React\Socket\TcpServer;
 
 class FunctionalConnectorTest extends TestCase
 {
@@ -14,7 +14,7 @@ class FunctionalConnectorTest extends TestCase
     /** @test */
     public function connectionToTcpServerShouldSucceedWithLocalhost()
     {
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
 
         $server = new TcpServer(9998, $loop);
         $server->on('connection', $this->expectCallableOnce());

tests/IntegrationTest.php

@@ -2,13 +2,13 @@
 
 namespace React\Tests\Socket;
 
-use React\Dns\Resolver\Factory;
-use React\EventLoop\StreamSelectLoop;
+use Clue\React\Block;
+use React\Dns\Resolver\Factory as ResolverFactory;
+use React\EventLoop\Factory;
 use React\Socket\Connector;
+use React\Socket\DnsConnector;
 use React\Socket\SecureConnector;
 use React\Socket\TcpConnector;
-use Clue\React\Block;
-use React\Socket\DnsConnector;
 
 class IntegrationTest extends TestCase
 {
@@ -17,7 +17,7 @@ class IntegrationTest extends TestCase
     /** @test */
     public function gettingStuffFromGoogleShouldWork()
     {
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
         $connector = new Connector($loop);
 
         $conn = Block\await($connector->connect('google.com:80'), $loop);
@@ -39,7 +39,7 @@ public function gettingEncryptedStuffFromGoogleShouldWork()
             $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
         }
 
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
         $secureConnector = new Connector($loop);
 
         $conn = Block\await($secureConnector->connect('tls://google.com:443'), $loop);
@@ -58,9 +58,9 @@ public function gettingEncryptedStuffFromGoogleShouldWorkIfHostIsResolvedFirst()
             $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
         }
 
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
 
-        $factory = new Factory();
+        $factory = new ResolverFactory();
         $dns = $factory->create('8.8.8.8', $loop);
 
         $connector = new DnsConnector(
@@ -83,7 +83,7 @@ public function gettingEncryptedStuffFromGoogleShouldWorkIfHostIsResolvedFirst()
     /** @test */
     public function gettingPlaintextStuffFromEncryptedGoogleShouldNotWork()
     {
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
         $connector = new Connector($loop);
 
         $conn = Block\await($connector->connect('google.com:443'), $loop);
@@ -101,9 +101,9 @@ public function gettingPlaintextStuffFromEncryptedGoogleShouldNotWork()
     /** @test */
     public function testConnectingFailsIfDnsUsesInvalidResolver()
     {
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
 
-        $factory = new Factory();
+        $factory = new ResolverFactory();
         $dns = $factory->create('demo.invalid', $loop);
 
         $connector = new Connector($loop, array(
@@ -121,7 +121,7 @@ public function testConnectingFailsIfTimeoutIsTooSmall()
             $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
         }
 
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
 
         $connector = new Connector($loop, array(
             'timeout' => 0.001
@@ -138,7 +138,7 @@ public function testSelfSignedRejectsIfVerificationIsEnabled()
             $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
         }
 
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
 
         $connector = new Connector($loop, array(
             'tls' => array(
@@ -157,7 +157,7 @@ public function testSelfSignedResolvesIfVerificationIsDisabled()
             $this->markTestSkipped('Not supported on your platform (outdated HHVM?)');
         }
 
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
 
         $connector = new Connector($loop, array(
             'tls' => array(
@@ -171,7 +171,7 @@ public function testSelfSignedResolvesIfVerificationIsDisabled()
 
     public function testCancelPendingConnection()
     {
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
 
         $connector = new TcpConnector($loop);
         $pending = $connector->connect('8.8.8.8:80');

tests/TcpConnectorTest.php

@@ -2,11 +2,11 @@
 
 namespace React\Tests\Socket;
 
-use React\EventLoop\StreamSelectLoop;
-use React\Socket\TcpServer;
-use React\Socket\TcpConnector;
-use React\Socket\ConnectionInterface;
 use Clue\React\Block;
+use React\EventLoop\Factory;
+use React\Socket\ConnectionInterface;
+use React\Socket\TcpConnector;
+use React\Socket\TcpServer;
 
 class TcpConnectorTest extends TestCase
 {
@@ -15,7 +15,7 @@ class TcpConnectorTest extends TestCase
     /** @test */
     public function connectionToEmptyPortShouldFail()
     {
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
 
         $connector = new TcpConnector($loop);
         $connector->connect('127.0.0.1:9999')
@@ -27,7 +27,7 @@ public function connectionToEmptyPortShouldFail()
     /** @test */
     public function connectionToTcpServerShouldSucceed()
     {
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
 
         $server = new TcpServer(9999, $loop);
         $server->on('connection', $this->expectCallableOnce());
@@ -45,7 +45,7 @@ public function connectionToTcpServerShouldSucceed()
     /** @test */
     public function connectionToTcpServerShouldSucceedWithRemoteAdressSameAsTarget()
     {
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
 
         $server = new TcpServer(9999, $loop);
         $server->on('connection', array($server, 'close'));
@@ -63,7 +63,7 @@ public function connectionToTcpServerShouldSucceedWithRemoteAdressSameAsTarget()
     /** @test */
     public function connectionToTcpServerShouldSucceedWithLocalAdressOnLocalhost()
     {
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
 
         $server = new TcpServer(9999, $loop);
         $server->on('connection', array($server, 'close'));
@@ -82,7 +82,7 @@ public function connectionToTcpServerShouldSucceedWithLocalAdressOnLocalhost()
     /** @test */
     public function connectionToTcpServerShouldSucceedWithNullAddressesAfterConnectionClosed()
     {
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
 
         $server = new TcpServer(9999, $loop);
         $server->on('connection', array($server, 'close'));
@@ -101,7 +101,7 @@ public function connectionToTcpServerShouldSucceedWithNullAddressesAfterConnecti
     /** @test */
     public function connectionToEmptyIp6PortShouldFail()
     {
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
 
         $connector = new TcpConnector($loop);
         $connector
@@ -114,7 +114,7 @@ public function connectionToEmptyIp6PortShouldFail()
     /** @test */
     public function connectionToIp6TcpServerShouldSucceed()
     {
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
 
         try {
             $server = new TcpServer('[::1]:9999', $loop);
@@ -191,7 +191,7 @@ public function connectionWithInvalidContextShouldFailImmediately()
     /** @test */
     public function cancellingConnectionShouldRejectPromise()
     {
-        $loop = new StreamSelectLoop();
+        $loop = Factory::create();
         $connector = new TcpConnector($loop);
 
         $server = new TcpServer(0, $loop);

tests/TcpServerTest.php

@@ -3,7 +3,7 @@
 namespace React\Tests\Socket;
 
 use Clue\React\Block;
-use React\EventLoop\StreamSelectLoop;
+use React\EventLoop\Factory;
 use React\Socket\TcpServer;
 use React\Stream\DuplexResourceStream;
 
@@ -15,7 +15,7 @@ class TcpServerTest extends TestCase
 
     private function createLoop()
     {
-        return new StreamSelectLoop();
+        return Factory::create();
     }
 
     /**

tests/UnixConnectorTest.php

@@ -2,9 +2,8 @@
 
 namespace React\Tests\Socket;
 
-use React\Socket\UnixConnector;
-use Clue\React\Block;
 use React\Socket\ConnectionInterface;
+use React\Socket\UnixConnector;
 
 class UnixConnectorTest extends TestCase
 {