From 936402ef72031780a9f6ba1d662eddc635275eb0 Mon Sep 17 00:00:00 2001
From: hantianfeng <rango@swoole.com>
Date: Sat, 6 Jul 2024 17:16:55 +0800
Subject: [PATCH] Fix tests

---
 tests/swoole_coroutine/check.phpt             |  6 ++---
 .../swoole_coroutine/output/in_nested_co.phpt |  5 ++--
 tests/swoole_coroutine/output/ob_main.phpt    |  4 +--
 tests/swoole_coroutine_util/fgets.phpt        | 21 +++++----------
 tests/swoole_coroutine_util/fread.phpt        | 15 +++--------
 tests/swoole_coroutine_util/fread_seek.phpt   | 26 -------------------
 tests/swoole_coroutine_util/fwrite.phpt       | 15 +++--------
 7 files changed, 21 insertions(+), 71 deletions(-)
 delete mode 100644 tests/swoole_coroutine_util/fread_seek.phpt

diff --git a/tests/swoole_coroutine/check.phpt b/tests/swoole_coroutine/check.phpt
index 036829313dc..fd2cb9d4124 100644
--- a/tests/swoole_coroutine/check.phpt
+++ b/tests/swoole_coroutine/check.phpt
@@ -30,15 +30,15 @@ $map = [
         Assert::assert(0); // never here
     },
     function () {
-        Co::fread(STDIN);
+        fread(STDIN);
         Assert::assert(0); // never here
     },
     function () {
-        Co::fgets(fopen(__FILE__, 'r'));
+        fgets(fopen(__FILE__, 'r'));
         Assert::assert(0); // never here
     },
     function () {
-        Co::fwrite(fopen(TEST_LOG_FILE, 'w+'), 'foo');
+        fwrite(fopen(TEST_LOG_FILE, 'w+'), 'foo');
         Assert::assert(0); // never here
     },
     function () {
diff --git a/tests/swoole_coroutine/output/in_nested_co.phpt b/tests/swoole_coroutine/output/in_nested_co.phpt
index 9723a3e56a3..f43e8cb315b 100644
--- a/tests/swoole_coroutine/output/in_nested_co.phpt
+++ b/tests/swoole_coroutine/output/in_nested_co.phpt
@@ -5,19 +5,18 @@ swoole_coroutine/output: use ob_* in nest co
 --FILE--
 <?php
 require __DIR__ . '/../../include/bootstrap.php';
-go(function () {
+Co\run(function () {
     ob_start();
     echo "2\n"; // [#1] yield
     go(function () {
         echo "1\n"; // [#2] output: 1
-        co::fgets(fopen(__FILE__, 'r')); // yield
+        fgets(fopen(__FILE__, 'r')); // yield
         // [#4] resume
         ob_start(); // to buffer
         echo "4\n";
     }); // [#5] destroyed and output: 4
     echo "3\n";
 }); // [#3] destroyed and output: 2 3
-Swoole\Event::wait();
 ?>
 --EXPECT--
 1
diff --git a/tests/swoole_coroutine/output/ob_main.phpt b/tests/swoole_coroutine/output/ob_main.phpt
index 10f93809601..c19bb9f22b3 100644
--- a/tests/swoole_coroutine/output/ob_main.phpt
+++ b/tests/swoole_coroutine/output/ob_main.phpt
@@ -7,10 +7,10 @@ swoole_coroutine/output: main output global
 require __DIR__ . '/../../include/bootstrap.php';
 ob_start();
 echo 'aaa';
-go(function () {
+Co\run(function () {
     ob_start();
     echo 'bbb';
-    co::fgets(fopen(__FILE__, 'r'));
+    fgets(fopen(__FILE__, 'r'));
     Assert::same(ob_get_clean(), 'bbb');
 });
 Assert::same(ob_get_clean(), 'aaa');
diff --git a/tests/swoole_coroutine_util/fgets.phpt b/tests/swoole_coroutine_util/fgets.phpt
index 0f9e0555115..5e45518ef62 100644
--- a/tests/swoole_coroutine_util/fgets.phpt
+++ b/tests/swoole_coroutine_util/fgets.phpt
@@ -6,33 +6,24 @@ swoole_coroutine_util: fgets
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 
-Co::set(['hook_flags' => 0]);
-
 Co\run(function () {
     $file = __DIR__ . '/../../examples/server/mixed.php';
 
-    $coroutine = '';
-    $fp = fopen($file, "r");
-    while (!feof($fp)) {
-        $coroutine .= co::fgets($fp);
-    }
-
-    $standard = '';
+    Swoole\Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
+    $coroutine = [];
     $fp = fopen($file, "r");
     while (!feof($fp)) {
-        $standard .= fgets($fp);
+        $coroutine [] = fgets($fp);
     }
 
-    Swoole\Runtime::enableCoroutine();
-    $runtime = '';
+    Swoole\Runtime::enableCoroutine(false);
+    $standard = [];
     $fp = fopen($file, "r");
     while (!feof($fp)) {
-        $runtime .= fgets($fp);
+        $standard [] = fgets($fp);
     }
 
     Assert::same($standard, $coroutine);
-    Assert::same($standard, $runtime);
-
     echo "DONE\n";
 });
 ?>
diff --git a/tests/swoole_coroutine_util/fread.phpt b/tests/swoole_coroutine_util/fread.phpt
index 2f0d35153a0..ff069f7485c 100644
--- a/tests/swoole_coroutine_util/fread.phpt
+++ b/tests/swoole_coroutine_util/fread.phpt
@@ -5,21 +5,14 @@ swoole_coroutine_util: fread
 --FILE--
 <?php
 require __DIR__ . '/../include/bootstrap.php';
-
-use Swoole\Coroutine as co;
-
-co::create(function () {
+Co\run(function () {
     $fp = fopen(TEST_IMAGE, 'r');
-    if ($fp)
-    {
-        $data = co::fread($fp);
+    if ($fp) {
+        $data = fread($fp, 1024 * 1024);
         Assert::same(md5($data), md5_file(TEST_IMAGE));
-    }
-    else
-    {
+    } else {
         echo "ERROR\n";
     }
 });
-
 ?>
 --EXPECT--
diff --git a/tests/swoole_coroutine_util/fread_seek.phpt b/tests/swoole_coroutine_util/fread_seek.phpt
deleted file mode 100644
index 8e7b1640b84..00000000000
--- a/tests/swoole_coroutine_util/fread_seek.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-swoole_coroutine_util: fread and fseek
---SKIPIF--
-<?php require __DIR__ . '/../include/skipif.inc'; ?>
---FILE--
-<?php
-require __DIR__ . '/../include/bootstrap.php';
-
-use Swoole\Coroutine as co;
-
-co::create(function () {
-    $fp = fopen(__FILE__, 'r');
-    if ($fp) {
-        fseek($fp, 1024);
-        $php_data = fread($fp, fstat($fp)['size']);
-        $co_data = co::fread($fp);
-        Assert::same($php_data, $co_data);
-    } else {
-        echo "ERROR\n";
-    }
-});
-
-Swoole\Event::wait();
-
-?>
---EXPECT--
diff --git a/tests/swoole_coroutine_util/fwrite.phpt b/tests/swoole_coroutine_util/fwrite.phpt
index b6eff6dfe13..ef7ce07b29a 100644
--- a/tests/swoole_coroutine_util/fwrite.phpt
+++ b/tests/swoole_coroutine_util/fwrite.phpt
@@ -5,27 +5,20 @@ swoole_coroutine_util: fwrite
 --FILE--
 <?php
 require __DIR__ . '/../include/bootstrap.php';
-
-use Swoole\Coroutine as co;
-
-co::create(function () {
+Co\run(function () {
     $file = __DIR__ . '/tmp';
     $fp = fopen($file, 'w+');
     $data = RandStr::gen(8192 * 8);
-    if ($fp)
-    {
-        $ret = co::fwrite($fp, $data);
-        if ($ret)
-        {
+    if ($fp) {
+        $ret = fwrite($fp, $data);
+        if ($ret) {
             Assert::same(md5($data), md5_file($file));
             unlink($file);
-
             return;
         }
     }
     unlink($file);
     echo "ERROR\n";
 });
-
 ?>
 --EXPECT--