fix tests

Author: matyhtf

.gitignore

@@ -19,4 +19,3 @@
 /Dockerfile.bak
 /html/*
 /.idea
-*.pid

examples/remote-object/.gitignore

@@ -0,0 +1,5 @@
+remote-object-server.sock
+remote-object-server.log
+remote-object-server.pid
+remote-object-server.php
+remote-object-server.lock

examples/remote-object/server.php examples/remote-object/bootstrap.phpexamples/remote-object/server.php renamed to examples/remote-object/bootstrap.php

@@ -81,24 +81,3 @@ public function count(): int
         return count($this->list);
     }
 }
-
-//$server = new Swoole\RemoteObject\Server(options: [
-//    'worker_num'       => 4,
-//    'server_mode'      => SWOOLE_BASE,
-//    'enable_coroutine' => false,
-//    'bootstrap'        => __FILE__,
-//    'pid_file'         => __DIR__ . '/server.pid',
-//]);
-//$server->start();
-
-require_once dirname(__DIR__, 2) . '/src/ext/standard.php';
-
-(new Swoole\RemoteObject\Server('/home/swoole/.swoole/remote-object-server.sock', 0, [
-    'worker_num'       => 8,
-    'server_mode'      => 3,
-    'enable_coroutine' => false,
-    'bootstrap'        => __FILE__,
-    'pid_file'         => '/home/swoole/.swoole/remote-object-server.pid',
-    'log_file'         => '/home/swoole/.swoole/remote-object-server.log',
-    'socket_type'      => 5,
-]))->start();

src/functions.php

@@ -229,6 +229,8 @@ function swoole_init_default_remote_object_server(): void
 
     file_put_contents($php_file, '<?php' .
         "\nif (is_file(__DIR__ . '/vendor/autoload.php')) { require __DIR__ . '/vendor/autoload.php'; }" .
+        "\nif (is_file(__DIR__ . '/bootstrap.php')) { require __DIR__ . '/bootstrap.php'; }" .
+        "\n" .
         "\n(new Swoole\\RemoteObject\\Server("
         . "'{$socket_file}', 0, "
         . var_export($options, true) .

tests/bootstrap.php

@@ -68,14 +68,5 @@
 const DOCUMENT_ROOT = '/var/www/tests/www';
 
 $remote_object_dir = dirname(__DIR__) . '/examples/remote-object';
-
-if (!is_file($remote_object_dir . '/server.pid')
-    or !posix_kill(intval(file_get_contents($remote_object_dir . '/server.pid')), 0)) {
-    $process = new Swoole\Process(function (Swoole\Process $process) use ($remote_object_dir) {
-        include $remote_object_dir . '/server.php';
-    });
-    $process->start();
-    register_shutdown_function(function () use ($process) {
-        Swoole\Process::kill($process->pid);
-    });
-}
+swoole_library_set_option('default_remote_object_server_worker_num', 8);
+swoole_library_set_option('default_remote_object_server_dir', $remote_object_dir);

tests/unit/RemoteObjectTest.php

@@ -29,7 +29,7 @@ class RemoteObjectTest extends TestCase
     public function testCallFunction(): void
     {
         run(function () {
-            $client = new RemoteObject\Client('127.0.0.1', RemoteObject\Server::DEFAULT_PORT);
+            $client = swoole_get_default_remote_object_client();
             $this->assertEquals('x86_64', $client->call('php_uname', 'm'));
             $gd_info = $client->call('gd_info');
             $this->assertIsArray($gd_info);
@@ -40,7 +40,7 @@ public function testCallFunction(): void
     public function testInvoke()
     {
         run(function () {
-            $client    = new RemoteObject\Client('127.0.0.1', RemoteObject\Server::DEFAULT_PORT);
+            $client    = swoole_get_default_remote_object_client();
             $o         = $client->create(\Greeter::class, 'Hello swoole');
             $this->assertEquals('Hello swoole, my name is Tianfeng.Han!', $o('my name is Tianfeng.Han'));
         });
@@ -49,7 +49,7 @@ public function testInvoke()
     public function testIterator()
     {
         run(function () {
-            $client    = new RemoteObject\Client('127.0.0.1', RemoteObject\Server::DEFAULT_PORT);
+            $client    = swoole_get_default_remote_object_client();
             $o         = $client->create(\Greeter::class, 'hello swoole');
             $list      =  iterator_to_array($o);
             $this->assertEquals($list, $o->list);
@@ -60,7 +60,7 @@ public function testIterator()
     public function testResource()
     {
         run(function () {
-            $client = new RemoteObject\Client('127.0.0.1', RemoteObject\Server::DEFAULT_PORT);
+            $client = swoole_get_default_remote_object_client();
             $fp     = $client->call('fopen', '/tmp/data.txt', 'w');
 
             $n     = random_int(1024, 65536);
@@ -85,7 +85,7 @@ public function testMongoDb(): void
 
                 public function __construct()
                 {
-                    $this->roClient   = new RemoteObject\Client();
+                    $this->roClient   =     swoole_get_default_remote_object_client();
                     $client           = $this->roClient->create(\MongoDB\Client::class, MONGODB_SERVER_URL);
                     $this->collection = $client->myDatabase->users;
                 }