close #3935 - Akka.Persistence.TCK.Query.TestActor now waits for dele…

…te confirmation before replying (#3936)
akkadotnet · Nov 14, 2019 · 1b29a93 · 1b29a93
1 parent 537f818
commit 1b29a93
Showing 1 changed file with 27 additions and 2 deletions.
diff --git a/src/core/Akka.Persistence.TCK/Query/TestActor.cs b/src/core/Akka.Persistence.TCK/Query/TestActor.cs
@@ -12,7 +12,7 @@
 
 namespace Akka.Persistence.TCK.Query
 {
-    internal class TestActor : UntypedPersistentActor
+    internal class TestActor : UntypedPersistentActor, IWithUnboundedStash
     {
         public static Props Props(string persistenceId) => Actor.Props.Create(() => new TestActor(persistenceId));
 
@@ -43,14 +43,39 @@ protected override void OnCommand(object message)
             {
                 case DeleteCommand delete:
                     DeleteMessages(delete.ToSequenceNr);
-                    Sender.Tell($"{delete.ToSequenceNr}-deleted");
+                    Become(WhileDeleting(Sender)); // need to wait for delete ACK to return
                     break;
                 case string cmd:
                     var sender = Sender;
                     Persist(cmd, e => sender.Tell($"{e}-done"));
                     break;
             }
         }
+
+        protected Receive WhileDeleting(IActorRef originalSender)
+        {
+            return message =>
+            {
+                switch (message)
+                {
+                    case DeleteMessagesSuccess success:
+                        originalSender.Tell($"{success.ToSequenceNr}-deleted");
+                        Become(OnCommand);
+                        Stash.UnstashAll();
+                        break;
+                    case DeleteMessagesFailure failure:
+                        originalSender.Tell($"{failure.ToSequenceNr}-deleted-failed");
+                        Become(OnCommand);
+                        Stash.UnstashAll();
+                        break;
+                    default:
+                        Stash.Stash();
+                        break;
+                }
+
+                return true;
+            };
+        }
     }
 
     public class ColorFruitTagger : IWriteEventAdapter