Added simple conditional abort test for composite

Author: ashblue

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

@@ -15,10 +15,12 @@ public void SetSelector () {
                 _selector = new Selector();
             }
 
-            public void CheckUpdateCalls (List<int> updateCalls) {
+            public void CheckUpdateCalls (ITaskParent selector, List<int> updateCalls) {
                 for (var i = 0; i < updateCalls.Count; i++) {
-                    var child = _selector.children[i];
-                    child.Received(updateCalls[i]).Update();
+                    var child = selector.children[i];
+                    if (updateCalls[i] >= 0) {
+                        child.Received(updateCalls[i]).Update();
+                    }
                 }
             }
 
@@ -62,7 +64,7 @@ public void Stops_on_continue () {
                     _selector.Update();
 
                     var updateCalls = new List<int> {1, 1, 0};
-                    CheckUpdateCalls(updateCalls);
+                    CheckUpdateCalls(_selector, updateCalls);
                 }
 
                 [Test]
@@ -77,7 +79,7 @@ public void Reruns_the_same_node_if_it_returns_continue () {
                     _selector.Update();
 
                     var updateCalls = new List<int> {1, 2};
-                    CheckUpdateCalls(updateCalls);
+                    CheckUpdateCalls(_selector, updateCalls);
                 }
 
                 [Test]
@@ -105,7 +107,7 @@ public void Stops_on_first_success_node () {
                     _selector.Update();
 
                     var updateCalls = new List<int> {1, 1, 0};
-                    CheckUpdateCalls(updateCalls);
+                    CheckUpdateCalls(_selector, updateCalls);
                 }
             }
 
@@ -137,7 +139,7 @@ public void Revaultes_first_condition_node_when_it_goes_from_failure_to_success
                     _selector.Update();
 
                     var updateCalls = new List<int> {3, 1};
-                    CheckUpdateCalls(updateCalls);
+                    CheckUpdateCalls(_selector, updateCalls);
                 }
 
                 [Test]
@@ -152,7 +154,7 @@ public void Does_not_revaluate_if_no_abort_type () {
                     _selector.Update();
 
                     var updateCalls = new List<int> {1, 2};
-                    CheckUpdateCalls(updateCalls);
+                    CheckUpdateCalls(_selector, updateCalls);
                 }
 
                 [Test]
@@ -167,7 +169,7 @@ public void Does_not_crash_if_self_abort_is_null () {
                     _selector.Update();
 
                     var updateCalls = new List<int> {1, 2};
-                    CheckUpdateCalls(updateCalls);
+                    CheckUpdateCalls(_selector, updateCalls);
                 }
 
                 [Test]
@@ -221,6 +223,62 @@ public void Returns_failure_if_nested_condition_is_followed_by_failure_task () {
                     Assert.AreEqual(TaskStatus.Continue, _selector.Update());
                 }
             }
+
+            public class ConditionalAbortLowerPrioritySelector {
+                public class AbortTypeSelector : UpdateMethod {
+                    [Test]
+                    public void Revaluates_from_where_a_conditional_abort_goes_from_failure_to_success () {
+                        var sequenceSub = new Sequence();
+                        sequenceSub.AbortType = AbortType.LowerPriority;
+                        
+                        var childFailure = A.TaskStub()
+                            .WithAbortConditionSelf(true)
+                            .WithUpdateStatus(TaskStatus.Failure)
+                            .Build();
+                        sequenceSub.AddChild(childFailure);
+                        sequenceSub.AddChild(A.TaskStub().Build());
+
+                        _selector
+                            .AddChild(sequenceSub)
+                            .AddChild(A.TaskStub().Build());
+
+                        _selector.Update();
+                        childFailure.Update().Returns(TaskStatus.Success);
+                        _selector.Update();
+                        
+                        CheckUpdateCalls(sequenceSub, new List<int>{3, 1});
+                        CheckUpdateCalls(_selector, new List<int>{-1, 1});
+                    }
+                    
+                    [Test]
+                    public void Returns_success_when_a_conditional_abort_goes_from_failure_to_success () {
+                        var sequenceSub = new Sequence();
+                        sequenceSub.AbortType = AbortType.LowerPriority;
+                        
+                        var childFailure = A.TaskStub()
+                            .WithAbortConditionSelf(true)
+                            .WithUpdateStatus(TaskStatus.Failure)
+                            .Build();
+                        sequenceSub.AddChild(childFailure);
+                        sequenceSub.AddChild(A.TaskStub().Build());
+
+                        _selector
+                            .AddChild(sequenceSub)
+                            .AddChild(A.TaskStub().Build());
+
+                        _selector.Update();
+                        childFailure.Update().Returns(TaskStatus.Success);
+                        
+                        Assert.AreEqual(TaskStatus.Success, _selector.Update());
+                    }
+                    
+                    // @TODO Verify nested conditional abort runs from correct starting point (currently tests all children)
+                }
+
+                public class AbortTypeComposite {
+                    // @TODO Add composite abort type tests
+                }
+            }
         }
     }
 }

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

@@ -7,6 +7,14 @@ protected override TaskStatus OnUpdate () {
                 return Update();
             }
 
+            foreach (var abort in AbortLowerPriorities) {
+                if (abort.Update() != TaskStatus.Success) continue;
+                children[ChildIndex].End();
+                Reset();
+                // @TODO Should use the abort's index to figure out what to revaluate
+                return Update();
+            }
+            
             for (var i = ChildIndex; i < children.Count; i++) {
                 var child = children[ChildIndex];
 
@@ -16,6 +24,14 @@ protected override TaskStatus OnUpdate () {
                     case TaskStatus.Continue:
                         return TaskStatus.Continue;
                 }
+                
+                if (child.IsLowerPriority) {
+                    var abortCondition = child.GetAbortCondition();
+                    if (abortCondition != null) {
+                        // @TODO Abort must include the current child index
+                        AbortLowerPriorities.Add(abortCondition);
+                    }
+                }
 
                 ChildIndex++;
             }

Assets/FluidBehaviorTree/Scripts/Tasks/ITask.cs

@@ -1,17 +1,37 @@
 namespace Adnc.FluidBT.Tasks {
     public interface ITask {
+        /// <summary>
+        /// Is this task enabled or not? Disabled tasks are excluded from the runtime
+        /// </summary>
         bool Enabled { get; set; }
+        
+        /// <summary>
+        /// Check if this node is a valid lower priority abort
+        /// </summary>
         bool IsLowerPriority { get; }
-
+        
+        /// <summary>
+        /// Triggered every tick
+        /// </summary>
+        /// <returns></returns>
         TaskStatus Update ();
 
+        /// <summary>
+        /// Returns the valid abort condition
+        /// </summary>
+        /// <returns></returns>
         ITask GetAbortCondition ();
 
-        /**
-         * Forcibly end this task. Firing all necessary completion logic
-         */
+        /// <summary>
+        /// Forcibly end this task. Firing all necessary completion logic
+        /// </summary>
         void End ();
 
+        /// <summary>
+        /// Reset this task back to its initial state. Hard reset should run all
+        /// one time run only logic (meant for pooling)
+        /// </summary>
+        /// <param name="hardReset"></param>
         void Reset (bool hardReset = false);
     }
 }