Skip to content

Commit 72b556e

Browse files
committed
Merge branch 'feature/remove-conditional-aborts' into develop
2 parents 542faef + 6e69c09 commit 72b556e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+396
-1488
lines changed

Assets/FluidBehaviorTree/Editor/Testing/Builders.meta renamed to Assets/FluidBehaviorTree/Editor/Builders.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/FluidBehaviorTree/Editor/Testing/Builders/A.cs.meta renamed to Assets/FluidBehaviorTree/Editor/Builders/A.cs.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/FluidBehaviorTree/Editor/Testing/Builders/TaskStubBuilder.cs renamed to Assets/FluidBehaviorTree/Editor/Builders/TaskStubBuilder.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ namespace Adnc.FluidBT.Testing {
66
public class TaskStubBuilder {
77
private bool _enabled = true;
88
private TaskStatus _status = TaskStatus.Success;
9-
private bool _abortConditionSelf;
109

1110
public TaskStubBuilder WithEnabled (bool enabled) {
1211
_enabled = enabled;
@@ -20,23 +19,10 @@ public TaskStubBuilder WithUpdateStatus (TaskStatus status) {
2019
return this;
2120
}
2221

23-
public TaskStubBuilder WithAbortConditionSelf (bool abortCondition) {
24-
_abortConditionSelf = abortCondition;
25-
26-
return this;
27-
}
28-
2922
public ITask Build () {
3023
var task = Substitute.For<ITask>();
3124
task.Enabled.Returns(_enabled);
3225
task.Update().Returns(_status);
33-
task.GetAbortStatus().Returns(i => task.Update());
34-
35-
if (_abortConditionSelf) {
36-
task.GetAbortCondition().Returns(task);
37-
} else {
38-
task.GetAbortCondition().ReturnsNull();
39-
}
4026

4127
return task;
4228
}

Assets/FluidBehaviorTree/Editor/Testing/Builders/TaskStubBuilder.cs.meta renamed to Assets/FluidBehaviorTree/Editor/Builders/TaskStubBuilder.cs.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/FluidBehaviorTree/Editor/Testing/Decorators.meta

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)