Covered common functionality

Author: Alex

tests/Handler.php

@@ -2,15 +2,19 @@
 
 use Generator;
 use Ollyxar\WebSockets\{
+    Dispatcher,
     Frame,
     Handler as BaseHandler,
-    Dispatcher,
     Logger
 };
 
 class Handler extends BaseHandler
 {
-
+    /**
+     * Handler constructor.
+     * @param $server
+     * @param $master
+     */
     public function __construct($server, $master)
     {
         parent::__construct($server, $master);
@@ -29,6 +33,10 @@ protected function onConnect($client): Generator
         ]))));
     }
 
+    /**
+     * @param $clientNumber
+     * @return Generator
+     */
     protected function onClose($clientNumber): Generator
     {
         yield Dispatcher::async($this->broadcast(Frame::encode(json_encode([

tests/ServerTest.php

@@ -2,10 +2,10 @@
 
 use PHPUnit\Framework\TestCase;
 use Ollyxar\WebSockets\{
+    Exceptions\ForkException,
+    Exceptions\SocketException,
     Frame,
     Server,
-    Exceptions\ForkException,
-    Logger,
     Ssl
 };
 
@@ -25,7 +25,8 @@ class ServerTest extends TestCase
         'path'       => '/tmp/cert.pem',
         'passPhrase' => 'qwerty123'
     ];
-    private $client;
+
+    public static $serverStarted = false;
 
     /**
      * Starts Server
@@ -34,26 +35,13 @@ class ServerTest extends TestCase
      */
     private function startServer(): void
     {
-        Logger::enable();
-        Server::$connector = '/tmp/ws.sock';
-
         (new Server('0.0.0.0', static::PORT, 2, true))
             ->setHandler(Handler::class)
             ->setCert(static::CERT['path'])
             ->setPassPhrase(static::CERT['passPhrase'])
             ->run();
     }
 
-    /**
-     * Stops server
-     *
-     * @return void
-     */
-    private function stopServer(): void
-    {
-        posix_kill($this->serverPid, SIGINT);
-    }
-
     /**
      * Forking process to get properly working Server and separated test
      *
@@ -62,23 +50,30 @@ private function stopServer(): void
      */
     private function forkProcess(): void
     {
+        if (static::$serverStarted) {
+            return;
+        }
+
         $pid = pcntl_fork();
 
         if ($pid == -1) {
             throw new ForkException('Cannot fork process');
         } elseif ($pid) {
             $this->serverPid = $pid;
+            sleep(3);
         } else {
             $this->startServer();
         }
+
+        static::$serverStarted = true;
     }
 
     /**
      * Making lightweight WebSocket client
      *
-     * @return void
+     * @return resource
      */
-    private function makeClient(): void
+    private function makeClient()
     {
         $context = stream_context_create([
             'ssl' => [
@@ -91,7 +86,9 @@ private function makeClient(): void
             ]
         ]);
 
-        $this->client = stream_socket_client('ssl://localhost:' . static::PORT, $errorNumber, $errorString, null, STREAM_CLIENT_CONNECT | STREAM_CLIENT_PERSISTENT, $context);
+        sleep(3); // prevent receiving previous messages from queue
+
+        return stream_socket_client('ssl://localhost:' . static::PORT, $errorNumber, $errorString, null, STREAM_CLIENT_CONNECT | STREAM_CLIENT_PERSISTENT, $context);
     }
 
     /**
@@ -136,41 +133,81 @@ private function generateHandshakeRequest(): string
     }
 
     /**
+     * ServerTest constructor.
+     *
+     * @param null $name
+     * @param array $data
+     * @param string $dataName
      * @throws ForkException
      */
-    public function setUp()
+    public function __construct($name = null, array $data = [], $dataName = '')
     {
+        Server::$connector = '/tmp/ws.sock';
         Ssl::generateCert(static::CERT['path'], static::CERT['passPhrase']);
         $this->forkProcess();
-        sleep(3);
-        $this->makeClient();
+
+        parent::__construct($name, $data, $dataName);
     }
 
     /**
-     * Free resources
+     * Simple messaging
+     *
+     * @throws SocketException
      */
-    public function __destruct()
+    public function testBasicMessaging()
     {
-        //$this->stopServer(); // doesn't work on TravisCI
-        @unlink(static::CERT['path']);
+        $client = $this->makeClient();
+
+        if (!$client) {
+            throw new SocketException('Client socket does not created properly');
+        }
+
+        fwrite($client, $this->generateHandshakeRequest());
+        $response = fread($client, 4096);
+        $this->assertContains('101 Web Socket Protocol Handshake', $response);
+
+        $data = Frame::decode($client);
+        $this->assertArrayHasKey('payload', $data);
+        $this->assertContains('connected.', $data['payload']);
+
+        fwrite($client, Frame::encode('client:hello'));
+        $data = Frame::decode($client);
+        $this->assertArrayHasKey('payload', $data);
+        $this->assertEquals('client:hello', $data['payload']);
+
+        fclose($client);
     }
 
     /**
-     * Simple messaging
+     * Base connector test
+     *
+     * @throws SocketException
      */
-    public function testBasicMessaging()
+    public function testConnector()
     {
-        fwrite($this->client, $this->generateHandshakeRequest());
-        $response = fread($this->client, 4096);
+        $client = $this->makeClient();
+
+        if (!$client) {
+            throw new SocketException('Client socket does not created properly');
+        }
+
+        fwrite($client, $this->generateHandshakeRequest());
+        $response = fread($client, 4096);
         $this->assertContains('101 Web Socket Protocol Handshake', $response);
 
-        $data = Frame::decode($this->client);
+        $data = Frame::decode($client);
         $this->assertArrayHasKey('payload', $data);
         $this->assertContains('connected.', $data['payload']);
 
-        fwrite($this->client, Frame::encode('Hello message'));
-        $data = Frame::decode($this->client);
+        $socket = socket_create(AF_UNIX, SOCK_STREAM, 0);
+        socket_connect($socket, Server::$connector);
+        socket_write($socket, Frame::encode('connector:hello'));
+        socket_close($socket);
+
+        $data = Frame::decode($client);
         $this->assertArrayHasKey('payload', $data);
-        $this->assertEquals('Hello message', $data['payload']);
+        $this->assertEquals('connector:hello', $data['payload']);
+
+        fclose($client);
     }
 }