Skip to content

Commit

Permalink
fix(parallel): prevents crashes when used with Splice()
Browse files Browse the repository at this point in the history 
Was calleing `End()` on the root node which had a not implemented exception error. Threw and caused
a false positive inside a parallel composite.
  • Loading branch information
@ashblue
ashblue committed Feb 10, 2020
1 parent ab5762a commit 010d4ef
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 44 deletions.
5 changes: 4 additions & 1 deletion Assets/FluidBehaviorTree/Runtime/TaskParents/TaskRoot.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@ protected override TaskStatus OnUpdate () {
var child = Children[0];
return child.Update();
}

public override void End () {
}
}
}
}
106 changes: 63 additions & 43 deletions Assets/FluidBehaviorTree/Tests/Editor/BehaviorTrees/Builders/BehaviorTreeBuilderTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace CleverCrow.Fluid.BTs.Trees.Testing {
public class BehaviorTreeBuilderTest {
private int _invokeCount;
private BehaviorTreeBuilder _builder;

[SetUp]
public void BeforeEach () {
_invokeCount = 0;
Expand All @@ -21,13 +21,13 @@ public void It_should_add_a_random_selector () {
var tree = _builder
.SelectorRandom("random selector")
.Build();

var selectorRandom = tree.Root.Children[0] as SelectorRandom;

Assert.IsNotNull(selectorRandom);
}
}

public class SequenceMethod : BehaviorTreeBuilderTest {
[Test]
public void Create_a_sequence () {
Expand All @@ -38,15 +38,15 @@ public void Create_a_sequence () {
return TaskStatus.Success;
})
.Build();

var sequence = tree.Root.Children[0] as Sequence;

Assert.AreEqual(tree.Root.Children.Count, 1);
Assert.AreEqual(sequence.Children.Count, 1);
Assert.AreEqual(TaskStatus.Success, tree.Tick());
Assert.AreEqual(1, _invokeCount);
}

[Test]
public void Create_a_nested_sequence () {
var tree = _builder
Expand All @@ -61,16 +61,16 @@ public void Create_a_nested_sequence () {
return TaskStatus.Success;
})
.Build();

var sequence = tree.Root.Children[0] as Sequence;
Assert.AreEqual(2, sequence.Children.Count);

var nested = sequence.Children[1] as Sequence;
Assert.AreEqual(nested.Children.Count, 1);
Assert.AreEqual(TaskStatus.Success, tree.Tick());
Assert.AreEqual(2, _invokeCount);
}

[Test]
public void Create_a_nested_sequence_then_add_an_action_to_the_parent () {
var tree = _builder
Expand All @@ -90,16 +90,16 @@ public void Create_a_nested_sequence_then_add_an_action_to_the_parent () {
return TaskStatus.Success;
})
.Build();

var sequence = tree.Root.Children[0] as Sequence;
Assert.AreEqual(3, sequence.Children.Count);

var nested = sequence.Children[1] as Sequence;
Assert.AreEqual(nested.Children.Count, 1);
Assert.AreEqual(TaskStatus.Success, tree.Tick());
Assert.AreEqual(3, _invokeCount);
}

[Test]
public void Create_two_nested_sequences_with_actions () {
var tree = _builder
Expand All @@ -116,16 +116,16 @@ public void Create_two_nested_sequences_with_actions () {
return TaskStatus.Success;
})
.Build();

var sequence = tree.Root.Children[0] as Sequence;
Assert.AreEqual(2, sequence.Children.Count);

var nested = sequence.Children[0] as Sequence;
Assert.AreEqual(nested.Children.Count, 1);

var nestedAlt = sequence.Children[1] as Sequence;
Assert.AreEqual(nestedAlt.Children.Count, 1);

Assert.AreEqual(TaskStatus.Success, tree.Tick());
Assert.AreEqual(2, _invokeCount);
}
Expand All @@ -145,9 +145,9 @@ public void Create_a_selector () {
return TaskStatus.Success;
})
.Build();

var selector = tree.Root.Children[0] as Selector;

Assert.AreEqual(tree.Root.Children.Count, 1);
Assert.AreEqual(selector.Children.Count, 2);
Assert.AreEqual(TaskStatus.Success, tree.Tick());
Expand All @@ -169,9 +169,9 @@ public void Create_a_selector () {
return TaskStatus.Success;
})
.Build();

var parallel = tree.Root.Children[0] as Parallel;

Assert.AreEqual(tree.Root.Children.Count, 1);
Assert.AreEqual(parallel.Children.Count, 2);
Assert.AreEqual(TaskStatus.Success, tree.Tick());
Expand All @@ -193,7 +193,7 @@ public void It_should_add_a_condition () {
return TaskStatus.Success;
})
.Build();

var sequence = tree.Root.Children[0] as Sequence;
var condition = sequence.Children[0] as ConditionGeneric;

Expand All @@ -202,7 +202,7 @@ public void It_should_add_a_condition () {
Assert.AreEqual(TaskStatus.Success, tree.Tick());
Assert.AreEqual(2, _invokeCount);
}

[Test]
public void It_should_add_a_condition_without_a_name () {
var tree = _builder
Expand All @@ -211,15 +211,15 @@ public void It_should_add_a_condition_without_a_name () {
return true;
})
.Build();

var condition = tree.Root.Children[0] as ConditionGeneric;

Assert.IsNotNull(condition);
Assert.AreEqual(TaskStatus.Success, tree.Tick());
Assert.AreEqual(1, _invokeCount);
}
}

public class DoMethod : BehaviorTreeBuilderTest {
[Test]
public void It_should_add_an_action () {
Expand All @@ -229,14 +229,14 @@ public void It_should_add_an_action () {
return TaskStatus.Success;
})
.Build();

var action = tree.Root.Children[0] as ActionGeneric;

Assert.IsNotNull(action);
Assert.AreEqual(TaskStatus.Success, tree.Tick());
Assert.AreEqual(1, _invokeCount);
}

[Test]
public void It_should_add_an_action_without_a_name () {
var tree = _builder
Expand All @@ -245,7 +245,7 @@ public void It_should_add_an_action_without_a_name () {
return TaskStatus.Success;
})
.Build();

var action = tree.Root.Children[0] as ActionGeneric;

Assert.IsNotNull(action);
Expand All @@ -270,7 +270,7 @@ public void It_should_add_a_decorator () {
.Build();

var decorator = tree.Root.Children[0] as DecoratorGeneric;

Assert.IsNotNull(decorator);
Assert.AreEqual(TaskStatus.Failure, tree.Tick());
Assert.AreEqual(2, _invokeCount);
Expand All @@ -291,7 +291,7 @@ public void It_should_add_a_decorator_without_a_name () {
.Build();

var decorator = tree.Root.Children[0] as DecoratorGeneric;

Assert.IsNotNull(decorator);
Assert.AreEqual(TaskStatus.Failure, tree.Tick());
Assert.AreEqual(2, _invokeCount);
Expand Down Expand Up @@ -319,7 +319,7 @@ public void It_should_move_to_the_next_node_on_End () {

var sequence = tree.Root.Children[0] as Sequence;
var decorator = sequence.Children[0] as DecoratorGeneric;

Assert.IsNotNull(decorator);
Assert.AreEqual(TaskStatus.Success, tree.Tick());
Assert.AreEqual(3, _invokeCount);
Expand All @@ -338,13 +338,13 @@ public void It_should_create_an_inverter () {
.Build();

var decorator = tree.Root.Children[0] as Inverter;

Assert.IsNotNull(decorator);
Assert.AreEqual(TaskStatus.Failure, tree.Tick());
Assert.AreEqual(1, _invokeCount);
}
}

public class ReturnSuccessMethod : BehaviorTreeBuilderTest {
[Test]
public void It_should_create_a_ReturnSuccess () {
Expand All @@ -357,13 +357,13 @@ public void It_should_create_a_ReturnSuccess () {
.Build();

var decorator = tree.Root.Children[0] as ReturnSuccess;

Assert.IsNotNull(decorator);
Assert.AreEqual(TaskStatus.Success, tree.Tick());
Assert.AreEqual(1, _invokeCount);
}
}

public class ReturnFailureMethod : BehaviorTreeBuilderTest {
[Test]
public void It_should_create_a_ReturnFailure () {
Expand All @@ -376,7 +376,7 @@ public void It_should_create_a_ReturnFailure () {
.Build();

var decorator = tree.Root.Children[0] as ReturnFailure;

Assert.IsNotNull(decorator);
Assert.AreEqual(TaskStatus.Failure, tree.Tick());
Assert.AreEqual(1, _invokeCount);
Expand All @@ -394,7 +394,7 @@ public void It_should_add_a_random_chance () {
return TaskStatus.Success;
})
.Build();

var sequence = tree.Root.Children[0] as Sequence;
var condition = sequence.Children[0] as RandomChance;

Expand Down Expand Up @@ -435,22 +435,42 @@ public void It_should_add_a_WaitTime_action () {
var tree = _builder
.WaitTime("Custom")
.Build();

var waitTime = tree.Root.Children[0] as WaitTime;

Assert.IsNotNull(waitTime);
}

[Test]
public void It_should_set_WaitTime_duration () {
var tree = _builder
.WaitTime(2f)
.Build();

var waitTime = tree.Root.Children[0] as WaitTime;

Assert.AreEqual(2f, waitTime.time);
}
}

public class SpliceMethod : BehaviorTreeBuilderTest {
[Test]
public void It_should_not_fail_when_aborting_a_built_condition () {
var treeAlt = new BehaviorTreeBuilder(null)
.Sequence()
.Condition(() => false)
.End()
.Build();

var tree = _builder
.Parallel()
.Splice(treeAlt)
.Build();

Assert.DoesNotThrow(() => {
tree.Tick();
});
}
}
}
}
}

0 comments on commit 010d4ef

Please sign in to comment.