Completion of parallel composite

Author: ashblue

Assets/FluidBehaviorTree/Editor/Testing/ParentTasks/ParallelTest.cs

@@ -5,14 +5,14 @@
 
 namespace Adnc.FluidBT.Testing {
     public class ParallelTest {
-        public class UpdateMethod {
-            private Parallel parallel;
+        private Parallel parallel;
 
-            [SetUp]
-            public void SetParallel () {
-                parallel = new Parallel();
-            }
+        [SetUp]
+        public void SetParallel () {
+            parallel = new Parallel();
+        }
 
+        public class UpdateMethod : ParallelTest {
             public class OnSuccess : UpdateMethod {
                 [SetUp]
                 public void CreateTree () {
@@ -117,21 +117,42 @@ public void Runs_end_on_all_children_when_complete () {
             }
         }
 
-        public class EndMethod {
+        public class EndMethod : ParallelTest {
+            [Test]
             public void Ends_all_ongoing_tasks () {
+                parallel
+                    .AddChild(A.TaskStub().Build())
+                    .AddChild(A.TaskStub().Build());
 
-            }
-
-            public void Does_not_end_any_tasks_if_called_before_update () {
+                parallel.End();
 
+                parallel.children.ForEach((child) => child.Received(1).End());
             }
         }
 
-        public class ResetMethod {
+        public class ResetMethod : ParallelTest {
+            [Test]
             public void Does_not_recall_previous_node_status_after_usage () {
+                parallel
+                    .AddChild(A.TaskStub().WithUpdateStatus(TaskStatus.Continue).Build())
+                    .AddChild(A.TaskStub().Build());
+
+                parallel.Update();
+                parallel.Reset();
+                parallel.Update();
+
+                parallel.children.ForEach((child) => child.Received(2).Update());
             }
 
+            [Test]
             public void Does_not_trigger_end_on_children () {
+                parallel
+                    .AddChild(A.TaskStub().Build())
+                    .AddChild(A.TaskStub().Build());
+
+                parallel.Reset();
+
+                parallel.children.ForEach((child) => child.Received(0).End());
             }
         }
     }

Assets/FluidBehaviorTree/Scripts/TaskParents/Composites/Parallel.cs

@@ -30,22 +30,28 @@ protected override TaskStatus OnUpdate () {
             }
 
             if (successCount == children.Count) {
-                foreach (var child in children) {
-                    child.End();
-                }
-
+                End();
                 return TaskStatus.Success;
             }
 
             if (failureCount > 0) {
-                foreach (var child in children) {
-                    child.End();
-                }
-
+                End();
                 return TaskStatus.Failure;
             }
 
             return TaskStatus.Continue;
         }
+
+        public override void Reset (bool hardReset = false) {
+            _childStatus.Clear();
+
+            base.Reset(hardReset);
+        }
+
+        public override void End () {
+            foreach (var child in children) {
+                child.End();
+            }
+        }
     }
 }