@@ -122,7 +122,7 @@ TEST_F(SimpleParallelTest, ConditionsTrue)
122
122
123
123
TEST_F (SimpleParallelTest, Threshold_3)
124
124
{
125
- root.setThresholdM (3 );
125
+ root.setSuccessThreshold (3 );
126
126
action_1.setTime ( milliseconds (100 ) );
127
127
action_2.setTime ( milliseconds (500 ) ); // this takes a lot of time
128
128
@@ -147,7 +147,7 @@ TEST_F(SimpleParallelTest, Threshold_3)
147
147
148
148
TEST_F (SimpleParallelTest, Threshold_neg2)
149
149
{
150
- root.setThresholdM (-2 );
150
+ root.setSuccessThreshold (-2 );
151
151
action_1.setTime ( milliseconds (100 ) );
152
152
action_2.setTime ( milliseconds (500 ) ); // this takes a lot of time
153
153
@@ -173,7 +173,7 @@ TEST_F(SimpleParallelTest, Threshold_neg2)
173
173
174
174
TEST_F (SimpleParallelTest, Threshold_neg1)
175
175
{
176
- root.setThresholdM (-1 );
176
+ root.setSuccessThreshold (-1 );
177
177
action_1.setTime ( milliseconds (100 ) );
178
178
action_2.setTime ( milliseconds (500 ) ); // this takes a lot of time
179
179
@@ -207,8 +207,8 @@ TEST_F(SimpleParallelTest, Threshold_neg1)
207
207
208
208
TEST_F (SimpleParallelTest, Threshold_thresholdFneg1)
209
209
{
210
- root.setThresholdM (1 );
211
- root.setThresholdFM (-1 );
210
+ root.setSuccessThreshold (1 );
211
+ root.setFailureThreshold (-1 );
212
212
action_1.setTime ( milliseconds (100 ) );
213
213
action_1.setExpectedResult (NodeStatus::FAILURE);
214
214
condition_1.setExpectedResult (NodeStatus::FAILURE);
@@ -226,7 +226,7 @@ TEST_F(SimpleParallelTest, Threshold_thresholdFneg1)
226
226
227
227
TEST_F (SimpleParallelTest, Threshold_2)
228
228
{
229
- root.setThresholdM (2 );
229
+ root.setSuccessThreshold (2 );
230
230
BT::NodeStatus state = root.executeTick ();
231
231
232
232
ASSERT_EQ (NodeStatus::IDLE, condition_1.status ());
@@ -270,8 +270,8 @@ TEST_F(ComplexParallelTest, ConditionsTrue)
270
270
271
271
TEST_F (ComplexParallelTest, ConditionsLeftFalse)
272
272
{
273
- parallel_left.setThresholdFM (3 );
274
- parallel_left.setThresholdM (3 );
273
+ parallel_left.setFailureThreshold (3 );
274
+ parallel_left.setSuccessThreshold (3 );
275
275
condition_L1.setExpectedResult (NodeStatus::FAILURE);
276
276
condition_L2.setExpectedResult (NodeStatus::FAILURE);
277
277
BT::NodeStatus state = parallel_root.executeTick ();
@@ -315,7 +315,7 @@ TEST_F(ComplexParallelTest, ConditionRightFalse)
315
315
316
316
TEST_F (ComplexParallelTest, ConditionRightFalse_thresholdF_2)
317
317
{
318
- parallel_right.setThresholdFM (2 );
318
+ parallel_right.setFailureThreshold (2 );
319
319
condition_R.setExpectedResult (NodeStatus::FAILURE);
320
320
BT::NodeStatus state = parallel_root.executeTick ();
321
321
@@ -355,8 +355,8 @@ TEST_F(ComplexParallelTest, ConditionRightFalseAction1Done)
355
355
{
356
356
condition_R.setExpectedResult (NodeStatus::FAILURE);
357
357
358
- parallel_right.setThresholdFM (2 );
359
- parallel_left.setThresholdM (4 );
358
+ parallel_right.setFailureThreshold (2 );
359
+ parallel_left.setSuccessThreshold (4 );
360
360
361
361
BT::NodeStatus state = parallel_root.executeTick ();
362
362
std::this_thread::sleep_for (milliseconds (300 ));
0 commit comments