Trying to close pending Completers. #18

Author: caduandrade

example/example.dart

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:simdart/simdart.dart';
 
 void main() async {
+
   final SimDart sim = SimDart(listener: ConsoleEventListener());
 
   sim.process(event: _eventA, name: 'A');

lib/src/event_phase.dart

@@ -11,8 +11,6 @@ enum EventPhase {
 
   yielded,
 
-  interrupted,
-
   finished;
 
   /// Returns the string representation of the status.

lib/src/internal/event_action.dart

@@ -65,6 +65,7 @@ class EventAction extends TimeAction implements SimContext {
       print('then $eventName ${sim.runState.name}');
         if (_eventCompleter != null && sim.runState==RunState.running) {
           //TODO method or throw?
+          print('aqui 2?');
           SimDartHelper.error(
               sim: sim,
               error:
@@ -79,15 +80,10 @@ class EventAction extends TimeAction implements SimContext {
             executionHash: hashCode);
         SimDartHelper.scheduleNextAction(sim: sim);
     }).catchError((error) {
+      print('ZZ $error');
       //TODO rever
-      if(error is CompleterInterrupt) {
-        sim.listener?.onEvent(
-            name: eventName,
-            time: sim.now,
-            phase: EventPhase.interrupted,
-            executionHash: hashCode);
-      } else  {
-        print('ZZ');
+      if(error is! CompleterInterrupt) {
+        print('aqui 3?');
         SimDartHelper.error(sim: sim, error: error);
       }
     });
@@ -97,6 +93,7 @@ class EventAction extends TimeAction implements SimContext {
   Future<void> wait(int delay) async {
     if (_eventCompleter != null) {
       //TODO method or throw?
+      print('aqui 1?');
       SimDartHelper.error(
           sim: sim,
           error: StateError("The event is already waiting. Did you forget to use 'await'?"));
@@ -178,7 +175,7 @@ class EventCompleter {
         time: event.sim.now,
         phase: EventPhase.resumed,
         executionHash: hashCode);
-    _completer.complete();
+      _completer.complete();
     event._eventCompleter = null;
     SimDartHelper.removeCompleter(sim: event.sim, completer: _completer);
   }

lib/src/simdart.dart

@@ -130,7 +130,14 @@ class SimDart implements SimDartInterface {
       _startTime = null;
       _scheduleNextAction();
       await _terminator.future;
-      print('foi: $_error');
+
+      try {
+        _disposeCompleteList();
+      }catch(e){
+        print(e);
+      }
+
+      print('foi: ${_error.runtimeType}: $_error');
       if (_error != null) {
         print('ue? erro?');
         _runState = RunState.error;
@@ -156,7 +163,7 @@ class SimDart implements SimDartInterface {
       if (!completer.isCompleted) {
         print('vai CompleterInterrupt');
         // prevents subsequent methods from being executed after complete inside the async method.
-        completer.completeError(CompleterInterrupt());
+          completer.completeError(CompleterInterrupt());
       }
     }
   }
@@ -234,9 +241,9 @@ class SimDart implements SimDartInterface {
   }
 
   void _scheduleNextAction() {
-    print('_scheduleNextAction');
-    _debugListener?.onScheduleNextAction();
     if (!_nextActionScheduled) {
+      print('_scheduleNextAction');
+      _debugListener?.onScheduleNextAction();
       _nextActionScheduled = true;
       if (executionPriority == 0 || _executionCount < executionPriority) {
         _executionCount++;
@@ -320,20 +327,20 @@ class SimDartHelper {
   }
 
   static void error({required SimDart sim, required StateError error}) {
+    print('error');
     if(sim._error==null) {
       sim._error = error;
       sim._runState = RunState.error;
     }
-    sim._disposeCompleteList();
   }
 
   static void setDebugListener({required SimDart sim, required DebugListener? listener}) {
     sim._debugListener=listener;
   }
 
   static void stop({required SimDart sim}) {
+    print('stopando');
     sim._debugListener?.onStop();
     sim._runState = RunState.stopped;
-    sim._disposeCompleteList();
   }
 }

test/stop_test.dart

@@ -60,8 +60,7 @@ void main() {
         '[0][a][called]',
         '[0][a][yielded]',
         '[1][b][called]',
-        '[1][b][finished]',
-        '[1][a][interrupted]'
+        '[1][b][finished]'
       ]);
       helper.testTracks([
         'scheduleNextAction',
@@ -75,7 +74,6 @@ void main() {
         'executeAction',
         'stop',
         'scheduleNextAction',
-        'scheduleNextAction',
         'nextAction'
       ]);
       expect(sim.counter('counter').value, 1);
@@ -128,6 +126,9 @@ void main() {
         'scheduleNextAction',
         'nextAction',
         'executeAction',
+        'scheduleNextAction',
+        'nextAction',
+        'executeAction',
         'stop',
         'scheduleNextAction',
         'nextAction'