update test

workbunny · Oct 18, 2024 · 249fef0 · 249fef0
1 parent 74c230e
commit 249fef0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/tests/EventsCase/SwooleEventTest.php b/tests/EventsCase/SwooleEventTest.php
@@ -235,29 +235,24 @@ public function testAddAndDelRead()
         $result = $swooleEvent->add('123', EventInterface::EV_READ, function () {
             echo 'Read event error';
         });
-
         $this->assertFalse($result);
-        // add
+        // Event::add
         $stream = fopen('php://memory', 'r+');
         $result = $swooleEvent->add($stream, EventInterface::EV_READ, function () {
             echo 'Read event1';
         });
-
         $this->assertTrue($result);
-        // set
+        // Event::set
+        $eventMock->shouldReceive('isset')->andReturn(true);
         $stream2 = fopen('php://memory', 'r+');
         $result = $swooleEvent->add($stream2, EventInterface::EV_READ, function () {
             echo 'Read event2';
         });
-
         $this->assertTrue($result);
-        // del
-        $eventMock->shouldReceive('del')->andReturn(true);
-        $eventMock->shouldReceive('isset')->andReturn(true);
 
-        $result = $swooleEvent->del($stream, EventInterface::EV_READ);
-        $this->assertTrue($result);
-        // del set
+        // ----
+
+        $eventMock->shouldReceive('del')->andReturn(true);
         $eventMock->shouldReceive('set')->andReturnUsing(function ($stream, $readCallback, $writeCallback, $event) {
             $this->assertTrue(is_resource($stream));
             $this->assertTrue(is_int($event));
@@ -266,7 +261,13 @@ public function testAddAndDelRead()
 
             return true;
         });
+        // Event::del
         $eventMock->shouldReceive('isset')->andReturn(false);
+        $result = $swooleEvent->del($stream, EventInterface::EV_READ);
+        $this->assertTrue($result);
+        // Event::set
+        $eventMock->shouldReceive('isset')->andReturn(false);
+
 
         $result = $swooleEvent->del($stream2, EventInterface::EV_READ);
         $this->assertTrue($result);
@@ -297,33 +298,31 @@ public function testAddAndDelWrite()
 
             return true;
         });
+
         $eventMock->shouldReceive('isset')->andReturn(false);
         // false
         $result = $swooleEvent->add('321', EventInterface::EV_WRITE, function () {
             echo 'Write event error';
         });
-
         $this->assertFalse($result);
-        // add
+        // Event::add
+        $eventMock->shouldReceive('isset')->andReturn(false);
         $stream = fopen('php://memory', 'w+');
         $result = $swooleEvent->add($stream, EventInterface::EV_WRITE, function () {
             echo 'Write event1';
         });
         $this->assertTrue($result);
-        // set
+        // Event::set
+        $eventMock->shouldReceive('isset')->andReturn(true);
         $stream2 = fopen('php://memory', 'w+');
         $result = $swooleEvent->add($stream2, EventInterface::EV_WRITE, function () {
             echo 'Write event2';
         });
-
         $this->assertTrue($result);
-        // del
-        $eventMock->shouldReceive('del')->andReturn(true);
-        $eventMock->shouldReceive('isset')->andReturn(true);
 
-        $result = $swooleEvent->del($stream, EventInterface::EV_WRITE);
-        $this->assertTrue($result);
-        // del set
+        // -----
+
+        $eventMock->shouldReceive('del')->andReturn(true);
         $eventMock->shouldReceive('set')->andReturnUsing(function ($stream, $readCallback, $writeCallback, $event) {
             $this->assertTrue(is_resource($stream));
             $this->assertTrue(is_int($event));
@@ -332,8 +331,12 @@ public function testAddAndDelWrite()
 
             return true;
         });
+        // Event::del
         $eventMock->shouldReceive('isset')->andReturn(false);
-
+        $result = $swooleEvent->del($stream, EventInterface::EV_WRITE);
+        $this->assertTrue($result);
+        // Event::set
+        $eventMock->shouldReceive('isset')->andReturn(true);
         $result = $swooleEvent->del($stream, EventInterface::EV_WRITE);
         $this->assertTrue($result);
         // false

diff --git a/tests/UtilsCase/Worker/WorkerTest.php b/tests/UtilsCase/Worker/WorkerTest.php
@@ -60,9 +60,6 @@ public function testWorkerUseFactoryInit()
         $reflection = new \ReflectionClass(AbstractWorker::class);
         $init = $reflection->getMethod('initWorkers');
         $init->invoke(null);
-        // onWorkerStart
-        $start = $reflection->getProperty('onWorkerStart');
-        call_user_func($start->getValue($worker), $worker);
 
         $this->assertEquals($onWorkerStart, $worker->getParentOnWorkerStart());
         $this->assertEquals($onWorkerStop, $worker->getParentOnWorkerStop());