Skip to content

Commit ce470d1

Browse files
committed
Refactor test utilities to improve compatibility with player builds
1 parent 485e330 commit ce470d1

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

Assets/_PackageRoot/Tests/Base/Utils/TestUtils.LoadFail.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Cysharp.Threading.Tasks;
44
using NUnit.Framework;
55
using UnityEngine;
6-
using UnityEngine.TestTools;
76

87
namespace Extensions.Unity.ImageLoader.Tests.Utils
98
{
@@ -29,10 +28,10 @@ public static IEnumerator LoadFail(string url, FutureLoadingFrom? expectedLoadin
2928

3029
var task1 = future.AsTask();
3130

32-
// TODO: To find a way to use it a player build
31+
// TODO: To find a way to use it in a player build
3332
#if UNITY_EDITOR
3433
if (expectedLoadingFrom.HasValue && expectedLoadingFrom.Value == FutureLoadingFrom.Source) // exception should be thrown only if ONLY loading from Source
35-
LogAssert.Expect(LogType.Error, $"[ImageLoader] Future[id={future.Id}] Timeout ({timeout}): {url}"); // compilation error in player build
34+
UnityEngine.TestTools.LogAssert.Expect(LogType.Error, $"[ImageLoader] Future[id={future.Id}] Timeout ({timeout}): {url}"); // compilation error in player build
3635
#endif
3736
yield return TestUtils.WaitWhile(() => future.IsInProgress, TimeSpan.FromSeconds(10));
3837
var task2 = future.AsTask();

Assets/_PackageRoot/Tests/Base/Utils/TestUtils.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.Linq;
55
using Cysharp.Threading.Tasks;
66
using UnityEngine;
7-
using UnityEngine.TestTools;
87

98
namespace Extensions.Unity.ImageLoader.Tests.Utils
109
{
@@ -32,9 +31,9 @@ public static IEnumerator ClearEverything(string message)
3231
{
3332
if (message != null)
3433
Debug.Log(message.PadRight(50, '-'));
35-
// TODO: To find a way to use it a player build
34+
// TODO: To find a way to use it in a player build
3635
#if UNITY_EDITOR
37-
LogAssert.ignoreFailingMessages = true; // compilation error in player build
36+
UnityEngine.TestTools.LogAssert.ignoreFailingMessages = true; // compilation error in player build
3837
#endif
3938
UniTaskScheduler.UnobservedExceptionWriteLogType = LogType.Exception;
4039
ImageLoader.ClearSpriteRef();
@@ -43,9 +42,9 @@ public static IEnumerator ClearEverything(string message)
4342

4443
WaitForGCFast();
4544

46-
// TODO: To find a way to use it a player build
45+
// TODO: To find a way to use it in a player build
4746
#if UNITY_EDITOR
48-
LogAssert.ignoreFailingMessages = false; // compilation error in player build
47+
UnityEngine.TestTools.LogAssert.ignoreFailingMessages = false; // compilation error in player build
4948
#endif
5049
}
5150
public static void WaitForGCFast()

Assets/_PackageRoot/Tests/Runtime/TestConcurrency.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
using System.Collections;
44
using NUnit.Framework;
55
using Cysharp.Threading.Tasks;
6-
using UnityEngine.TestTools;
76
using UnityEngine;
87
using System.Threading.Tasks;
98
using Extensions.Unity.ImageLoader.Tests.Utils;
9+
using UnityEngine.TestTools;
1010

1111
namespace Extensions.Unity.ImageLoader.Tests
1212
{

0 commit comments

Comments
 (0)