Skip to content

Commit 68c3f6c

Browse files
committed
Don't break conditional tests
1 parent 0895f55 commit 68c3f6c

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTest.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,6 +1635,12 @@ public static IEnumerator WaitForConditionOrTimeOut(IConditionalPredicate condit
16351635
throw new ArgumentNullException($"checkForCondition cannot be null!");
16361636
}
16371637

1638+
// If none is provided we use the default global time out helper
1639+
if (timeOutHelper == null)
1640+
{
1641+
timeOutHelper = s_GlobalTimeoutHelper;
1642+
}
1643+
16381644
conditionalPredicate.Started();
16391645
yield return WaitForConditionOrTimeOut(conditionalPredicate.HasConditionBeenReached, timeOutHelper);
16401646
conditionalPredicate.Finished(timeOutHelper.TimedOut);
@@ -1670,7 +1676,7 @@ public bool WaitForConditionOrTimeOutWithTimeTravel(IConditionalPredicate condit
16701676
/// <param name="timeoutErrorMessage">The error message to include in the assertion if the timeout is reached.</param>
16711677
/// <param name="timeOutHelper">An optional <see cref="TimeoutHelper"/> to control the timeout period. If null, the default timeout is used.</param>
16721678
/// <returns>An <see cref="IEnumerator"/> for use in Unity coroutines.</returns>
1673-
public IEnumerator WaitForConditionOrAssert(Func<bool> checkForCondition, string timeoutErrorMessage, TimeoutHelper timeOutHelper = null)
1679+
protected IEnumerator WaitForConditionOrAssert(Func<bool> checkForCondition, string timeoutErrorMessage, TimeoutHelper timeOutHelper = null)
16741680
{
16751681
yield return WaitForConditionOrTimeOut(checkForCondition, timeOutHelper);
16761682
AssertOnTimeout(timeoutErrorMessage, timeOutHelper);
@@ -1684,11 +1690,11 @@ public IEnumerator WaitForConditionOrAssert(Func<bool> checkForCondition, string
16841690
/// <param name="timeoutErrorMessage">The error message to include in the assertion if the timeout is reached. The information on the StringBuilder will be appended on a new line</param>
16851691
/// <param name="timeOutHelper">An optional <see cref="TimeoutHelper"/> to control the timeout period. If null, the default timeout is used.</param>
16861692
/// <returns>An <see cref="IEnumerator"/> for use in Unity coroutines.</returns>
1687-
public IEnumerator WaitForConditionOrAssert(Func<StringBuilder, bool> checkForCondition, string timeoutErrorMessage, TimeoutHelper timeOutHelper = null)
1693+
protected IEnumerator WaitForConditionOrAssert(Func<StringBuilder, bool> checkForCondition, string timeoutErrorMessage, TimeoutHelper timeOutHelper = null)
16881694
{
16891695
var errorBuilder = new StringBuilder();
16901696
yield return WaitForConditionOrTimeOut(() => checkForCondition(errorBuilder), timeOutHelper);
1691-
AssertOnTimeout($"{timeoutErrorMessage}\n{errorBuilder.ToString()}", timeOutHelper);
1697+
AssertOnTimeout($"{timeoutErrorMessage}\n{errorBuilder}", timeOutHelper);
16921698
}
16931699

16941700
/// <summary>

0 commit comments

Comments
 (0)