#9: + fix coroutine tests

Author: EdmondDantes

coroutine.c

@@ -96,9 +96,8 @@ METHOD(getException)
 
 	async_coroutine_t *coroutine = THIS_COROUTINE;
 
-	if (!ZEND_COROUTINE_IS_FINISHED(&coroutine->coroutine)) {
-		async_throw_error("Cannot get exception of a running coroutine");
-		RETURN_THROWS();
+	if (false == ZEND_COROUTINE_IS_FINISHED(&coroutine->coroutine)) {
+		RETURN_NULL();
 	}
 
 	if (coroutine->coroutine.exception == NULL) {
@@ -220,7 +219,8 @@ METHOD(isCancelled)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
 
-	RETURN_BOOL(ZEND_COROUTINE_IS_CANCELLED(&THIS_COROUTINE->coroutine));
+	RETURN_BOOL(ZEND_COROUTINE_IS_CANCELLED(&THIS_COROUTINE->coroutine)
+		&& ZEND_COROUTINE_IS_FINISHED(&THIS_COROUTINE->coroutine));
 }
 
 METHOD(isCancellationRequested)
@@ -229,9 +229,9 @@ METHOD(isCancellationRequested)
 
 	async_coroutine_t *coroutine = THIS_COROUTINE;
 
-	// TODO: Implement cancellation request tracking in waker
-	// For now, return same as isCancelled
-	RETURN_BOOL(ZEND_COROUTINE_IS_CANCELLED(&coroutine->coroutine));
+	RETURN_BOOL((ZEND_COROUTINE_IS_CANCELLED(&coroutine->coroutine)
+		&& !ZEND_COROUTINE_IS_FINISHED(&coroutine->coroutine))
+		|| coroutine->deferred_cancellation != NULL);
 }
 
 METHOD(isFinished)

tests/coroutine/004-coroutine_getException_running.phpt

@@ -9,13 +9,12 @@ $coroutine = spawn(function() {
     return "test";
 });
 
-try {
-    $coroutine->getException();
-    echo "Should not reach here\n";
-} catch (Async\AsyncException $e) {
-    echo "Caught: " . $e->getMessage() . "\n";
+if($coroutine->getException() === null) {
+    echo "No exception\n";
+} else {
+    echo "Exception: " . get_class($coroutine->getException()) . "\n";
 }
 
 ?>
 --EXPECT--
-Caught: Cannot get exception of a running coroutine
+No exception

tests/coroutine/028-coroutine_state_transitions.phpt

@@ -5,6 +5,7 @@ Coroutine state transitions and edge cases
 
 use function Async\spawn;
 use function Async\suspend;
+use function Async\await;
 
 echo "start\n";
 
@@ -38,7 +39,8 @@ echo "suspended state - isFinished: " . ($running_coroutine->isFinished() ? "tru
 
 try {
     $result = $running_coroutine->getResult();
-    echo "getResult on suspended should fail\n";
+    echo "getResult: ";
+    var_dump($result);
 } catch (\Error $e) {
     echo "getResult on suspended failed: " . get_class($e) . "\n";
 } catch (Throwable $e) {
@@ -52,7 +54,12 @@ $exception_coroutine = spawn(function() {
     throw new \RuntimeException("Test exception");
 });
 
-suspend(); // Let it start and suspend
+try {
+    await($exception_coroutine);
+} catch (\RuntimeException $e) {
+} catch (Throwable $e) {
+    echo "Unexpected exception: " . get_class($e) . ": " . $e->getMessage() . "\n";
+}
 
 echo "before exception - getException: ";
 try {
@@ -98,14 +105,15 @@ start
 before suspend - isQueued: true
 before suspend - isStarted: false
 queued coroutine executing
-after start - isQueued: false
+after start - isQueued: true
 after start - isStarted: true
 after start - isSuspended: true
 running coroutine started
 suspended state - isFinished: false
-getResult on suspended failed: Error
+getResult: NULL
+running coroutine continuing
 exception coroutine started
-before exception - getException: Error
+before exception - getException: RuntimeException
 after exception - getException: RuntimeException: Test exception
 cancel request coroutine started
 before cancel request - isCancellationRequested: false

tests/coroutine/029-coroutine_deferred_cancellation_basic.phpt

@@ -6,6 +6,7 @@ Basic coroutine deferred cancellation with protected operation
 use function Async\spawn;
 use function Async\suspend;
 use function Async\protect;
+use function Async\await;
 
 echo "start\n";
 
@@ -38,12 +39,15 @@ suspend();
 echo "after protected completion - cancelled: " . ($protected_coroutine->isCancelled() ? "true" : "false") . "\n";
 
 try {
-    $result = $protected_coroutine->getResult();
-    echo "protected result should not be available\n";
+    await($protected_coroutine);
 } catch (\Async\CancellationException $e) {
-    echo "deferred cancellation executed: " . $e->getMessage() . "\n";
 }
 
+$result = $protected_coroutine->getResult();
+
+echo "protected result: ";
+var_dump($result);
+
 echo "end\n";
 
 ?>
@@ -52,9 +56,9 @@ start
 protected coroutine started
 inside protected operation
 cancelling protected coroutine
-protected coroutine cancelled: true
+protected coroutine cancelled: false
 cancellation requested: true
 protected operation completed
 after protected completion - cancelled: true
-deferred cancellation executed: Deferred cancellation
+protected result: NULL
 end

tests/coroutine/030-coroutine_deferred_cancellation_multiple.phpt

@@ -6,6 +6,7 @@ Multiple deferred cancellations with sequential protect blocks
 use function Async\spawn;
 use function Async\suspend;
 use function Async\protect;
+use function Async\await;
 
 echo "start\n";
 
@@ -35,13 +36,8 @@ suspend(); // Enter first protection
 $multi_protected->cancel(new \Async\CancellationException("Multi deferred"));
 echo "multi cancelled during first protection\n";
 
-suspend(); // Complete first protection
-suspend(); // Enter second protection  
-suspend(); // Complete second protection
-
 try {
-    $result = $multi_protected->getResult();
-    echo "multi result should not be available\n";
+    await($multi_protected);
 } catch (\Async\CancellationException $e) {
     echo "multi deferred cancellation: " . $e->getMessage() . "\n";
 }
@@ -55,9 +51,5 @@ multi protected started
 first protected operation
 multi cancelled during first protection
 first protected completed
-between protections
-second protected operation
-second protected completed
-all protections completed
 multi deferred cancellation: Multi deferred
 end

tests/coroutine/031-coroutine_deferred_cancellation_during_protection.phpt

@@ -6,6 +6,7 @@ Cancellation of coroutine during protected operation with exception handling
 use function Async\spawn;
 use function Async\suspend;
 use function Async\protect;
+use function Async\await;
 
 echo "start\n";
 
@@ -33,12 +34,8 @@ suspend(); // Enter protection
 // Cancel while protected
 $already_protected->cancel(new \Async\CancellationException("Cancel during protection"));
 
-suspend(); // Still in protection
-suspend(); // Protection completes, cancellation should execute
-
 try {
-    $result = $already_protected->getResult();
-    echo "should not get result\n";
+    await($already_protected);
 } catch (\Async\CancellationException $e) {
     echo "protection cancellation: " . $e->getMessage() . "\n";
 }

tests/coroutine/032-coroutine_composite_exception.phpt

@@ -6,10 +6,25 @@ CompositeException with multiple finally handlers
 use function Async\spawn;
 use function Async\suspend;
 use function Async\currentCoroutine;
+use function Async\await;
 
 echo "start\n";
 
-$composite_coroutine = spawn(function() {
+$scope = new \Async\Scope();
+$scope->setExceptionHandler(function($scope, $coroutine, $exception) {
+
+    if(!$exception instanceof \Async\CompositeException) {
+        echo "caught exception: {$exception->getMessage()}\n";
+        return;
+    }
+
+    foreach ($exception->getExceptions() as $i => $error) {
+        $type = get_class($error);
+        echo "error {$i}: {$type}: {$error->getMessage()}\n";
+    }
+});
+
+$composite_coroutine = $scope->spawn(function() {
     echo "composite coroutine started\n";
 
     $coroutine = \Async\currentCoroutine();
@@ -31,22 +46,13 @@ $composite_coroutine = spawn(function() {
     });
 
     suspend();
-    throw new \RuntimeException("Main coroutine error");
+    throw new \RuntimeException("coroutine error");
 });
 
-suspend(); // Let it start and suspend
-suspend(); // Let it throw
-
 try {
-    $result = $composite_coroutine->getResult();
-    echo "should not get result\n";
-} catch (\Async\CompositeException $e) {
-    echo "caught CompositeException with " . count($e->getErrors()) . " errors\n";
-    foreach ($e->getErrors() as $index => $error) {
-        echo "error $index: " . get_class($error) . ": " . $error->getMessage() . "\n";
-    }
+    await($composite_coroutine);
 } catch (Throwable $e) {
-    echo "unexpected exception: " . get_class($e) . ": " . $e->getMessage() . "\n";
+    echo "caught: {$e->getMessage()}\n";
 }
 
 echo "end\n";
@@ -55,12 +61,11 @@ echo "end\n";
 --EXPECTF--
 start
 composite coroutine started
-finally 3 executing
-finally 2 executing
 finally 1 executing
-caught CompositeException with %d errors
-error %d: %s: %s
-error %d: %s: %s
-error %d: %s: %s
-error %d: %s: %s
+finally 2 executing
+finally 3 executing
+error 0: RuntimeException: Finally 1 error
+error 1: InvalidArgumentException: Finally 2 error
+error 2: LogicException: Finally 3 error
+caught: coroutine error
 end

tests/coroutine/034-coroutine_cancel_invalid_exception.phpt

@@ -37,20 +37,12 @@ try {
 // Valid cancellation
 $invalid_cancel_coroutine->cancel(new \Async\CancellationException("Valid cancellation"));
 
-try {
-    $result = $invalid_cancel_coroutine->getResult();
-    echo "should not get cancelled result\n";
-} catch (\Async\CancellationException $e) {
-    echo "valid cancellation: " . $e->getMessage() . "\n";
-}
-
 echo "end\n";
 
 ?>
 --EXPECTF--
 start
 invalid cancel coroutine started
-cancel string TypeError: %s
-%sRuntimeException%s
-valid cancellation: Valid cancellation
+cancel string TypeError: %a
+cancel RuntimeException TypeError:%a
 end

tests/coroutine/035-coroutine_deep_recursion.phpt

@@ -5,13 +5,14 @@ Coroutine with deep recursion and stack limits
 
 use function Async\spawn;
 use function Async\suspend;
+use function Async\await;
 
 echo "start\n";
 
 $deep_recursion_coroutine = spawn(function() {
     echo "deep recursion coroutine started\n";
 
-    function deepRecursionTest($depth, $maxDepth = 100) {
+    function deepRecursionTest($depth, $maxDepth = 1000) {
         if ($depth >= $maxDepth) {
             echo "reached max depth: $depth\n";
             return $depth;
@@ -28,7 +29,7 @@ $deep_recursion_coroutine = spawn(function() {
     return "recursion_result_$result";
 });
 
-$result = $deep_recursion_coroutine->getResult();
+$result = await($deep_recursion_coroutine);
 echo "deep recursion result: $result\n";
 
 echo "end\n";
@@ -37,6 +38,6 @@ echo "end\n";
 --EXPECTF--
 start
 deep recursion coroutine started
-reached max depth: 100
-deep recursion result: recursion_result_100
+reached max depth: 1000
+deep recursion result: recursion_result_1000
 end