fix test

workbunny · Oct 10, 2024 · 8a74fe9 · 8a74fe9
1 parent a09078b
commit 8a74fe9
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 47 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/tests/HandlersCase/RevoltHandlerTest.php b/tests/HandlersCase/RevoltHandlerTest.php
@@ -27,27 +27,41 @@ public function testInitEnv()
         $this->assertTrue(true);
     }
 
+    /**
+     * @runInSeparateProcess
+     * @return void
+     */
     public function testWaitFor()
     {
-        $rippleHandlerMock = Mockery::mock(RevoltHandler::class . '[sleep]');
-        $rippleHandlerMock->shouldReceive('sleep')->andReturnNull();
+        $suspensionMock = Mockery::mock('alias:\Revolt\EventLoop\Suspension');
+        $suspensionMock->shouldReceive('resume')->andReturnNull();
+        $suspensionMock->shouldReceive('suspend')->andReturnNull();
+
+        $eventLoopMock = Mockery::mock('alias:\Revolt\EventLoop');
+        $eventLoopMock->shouldReceive('getSuspension')->andReturn($suspensionMock);
+        $eventLoopMock->shouldReceive('defer')->andReturnUsing(function ($closure) {
+            $closure();
+        });
+        $eventLoopMock->shouldReceive('delay')->andReturnUsing(function ($timeout, $closure) {
+            $closure();
+        });
 
         $return = false;
-        $rippleHandlerMock::waitFor(function () use (&$return) {
+        RevoltHandler::waitFor(function () use (&$return) {
             return $return = true;
         });
         $this->assertTrue($return);
 
         $return = false;
-        $rippleHandlerMock::waitFor(function () use (&$return) {
+        RevoltHandler::waitFor(function () use (&$return) {
             sleep(1);
 
             return $return = true;
         });
         $this->assertTrue($return);
 
         $return = false;
-        $rippleHandlerMock::waitFor(function () use (&$return) {
+        RevoltHandler::waitFor(function () use (&$return) {
             return false;
         }, 1);
         $this->assertFalse($return);

diff --git a/tests/UtilsCase/Channel/RevoltChannelTest.php b/tests/UtilsCase/Channel/RevoltChannelTest.php
@@ -8,9 +8,6 @@
 use PHPUnit\Framework\TestCase;
 use Workbunny\WebmanCoroutine\Utils\Channel\Handlers\RevoltChannel;
 
-/**
- * @runTestsInSeparateProcesses
- */
 class RevoltChannelTest extends TestCase
 {
     protected function tearDown(): void
@@ -62,8 +59,18 @@ public function testClose()
 
     public function testPushWithTimeout()
     {
-        Mockery::mock('alias:\Workbunny\WebmanCoroutine\Handlers\RevoltHandler')
-            ->shouldReceive('sleep')->andReturnNull();
+        $suspensionMock = Mockery::mock('alias:\Revolt\EventLoop\Suspension');
+        $suspensionMock->shouldReceive('resume')->andReturnNull();
+        $suspensionMock->shouldReceive('suspend')->andReturnNull();
+
+        $eventLoopMock = Mockery::mock('alias:\Revolt\EventLoop');
+        $eventLoopMock->shouldReceive('getSuspension')->andReturn($suspensionMock);
+        $eventLoopMock->shouldReceive('defer')->andReturnUsing(function ($closure) {
+            $closure();
+        });
+        $eventLoopMock->shouldReceive('delay')->andReturnUsing(function ($timeout, $closure) {
+            $closure();
+        });
         $channel = new RevoltChannel(1);
         $channel->push('test');
 
@@ -72,8 +79,18 @@ public function testPushWithTimeout()
 
     public function testPopWithTimeout()
     {
-        Mockery::mock('alias:\Workbunny\WebmanCoroutine\Handlers\RevoltHandler')
-            ->shouldReceive('sleep')->andReturnNull();
+        $suspensionMock = Mockery::mock('alias:\Revolt\EventLoop\Suspension');
+        $suspensionMock->shouldReceive('resume')->andReturnNull();
+        $suspensionMock->shouldReceive('suspend')->andReturnNull();
+
+        $eventLoopMock = Mockery::mock('alias:\Revolt\EventLoop');
+        $eventLoopMock->shouldReceive('getSuspension')->andReturn($suspensionMock);
+        $eventLoopMock->shouldReceive('defer')->andReturnUsing(function ($closure) {
+            $closure();
+        });
+        $eventLoopMock->shouldReceive('delay')->andReturnUsing(function ($timeout, $closure) {
+            $closure();
+        });
         $channel = new RevoltChannel(1);
 
         $this->assertFalse($channel->pop(1));

diff --git a/tests/UtilsCase/Coroutine/RevoltCoroutineTest.php b/tests/UtilsCase/Coroutine/RevoltCoroutineTest.php
@@ -8,9 +8,6 @@
 use PHPUnit\Framework\TestCase;
 use Workbunny\WebmanCoroutine\Utils\Coroutine\Handlers\RevoltCoroutine;
 
-/**
- * @runTestsInSeparateProcesses
- */
 class RevoltCoroutineTest extends TestCase
 {
     protected function tearDown(): void

diff --git a/tests/UtilsCase/WaitGroup/RevoltWaitGroupTest.php b/tests/UtilsCase/WaitGroup/RevoltWaitGroupTest.php
@@ -8,9 +8,6 @@
 use PHPUnit\Framework\TestCase;
 use Workbunny\WebmanCoroutine\Utils\WaitGroup\Handlers\RevoltWaitGroup;
 
-/**
- * @runTestsInSeparateProcesses
- */
 class RevoltWaitGroupTest extends TestCase
 {
     protected function tearDown(): void
@@ -43,8 +40,18 @@ public function testCount()
 
     public function testWait()
     {
-        Mockery::mock('Workbunny\WebmanCoroutine\Handlers\RevoltHandler')
-            ->shouldReceive('sleep')->andReturnNull();
+        $suspensionMock = Mockery::mock('alias:\Revolt\EventLoop\Suspension');
+        $suspensionMock->shouldReceive('resume')->andReturnNull();
+        $suspensionMock->shouldReceive('suspend')->andReturnNull();
+
+        $eventLoopMock = Mockery::mock('alias:\Revolt\EventLoop');
+        $eventLoopMock->shouldReceive('getSuspension')->andReturn($suspensionMock);
+        $eventLoopMock->shouldReceive('defer')->andReturnUsing(function ($closure) {
+            $closure();
+        });
+        $eventLoopMock->shouldReceive('delay')->andReturnUsing(function ($timeout, $closure) {
+            $closure();
+        });
         $wg = new RevoltWaitGroup();
         $wg->add();
         $wg->done();