Skip to content

Commit

Permalink
chore: synced unity from 'test(Unity): fix obsolete warnings in later…
Browse files Browse the repository at this point in the history
… Unity versions'
  • Loading branch information
github-bot committed May 14, 2024
1 parent 210d6bb commit acd83aa
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ internal static async Task AssertErrorAsync<TResponse, TResult, TException>(Func

Assert.That(result.HasError, Is.True);
Assert.That(result.Exception, Is.Not.Null);
Assert.That(result.Exception.Message, Is.EqualTo(string.IsNullOrEmpty(errorMessage) ? GameJoltException.UNKNOWN_FATAL_ERROR : errorMessage));
Assert.That(result.Exception!.Message, Is.EqualTo(string.IsNullOrEmpty(errorMessage) ? GameJoltException.UNKNOWN_FATAL_ERROR : errorMessage));
Assert.That(result.Exception, Is.TypeOf<TException>());
}

Expand All @@ -208,7 +208,7 @@ internal static async Task AssertErrorAsync<TResponse, TException>(Func<TRespons

Assert.That(result.HasError, Is.True);
Assert.That(result.Exception, Is.Not.Null);
Assert.That(result.Exception.Message, Is.EqualTo(string.IsNullOrEmpty(errorMessage) ? GameJoltException.UNKNOWN_FATAL_ERROR : errorMessage));
Assert.That(result.Exception!.Message, Is.EqualTo(string.IsNullOrEmpty(errorMessage) ? GameJoltException.UNKNOWN_FATAL_ERROR : errorMessage));
Assert.That(result.Exception, Is.TypeOf<TException>());
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System.Threading.Tasks;
#nullable enable

using System.Threading.Tasks;
using Hertzole.GameJolt;
using NSubstitute;
using NUnit.Framework;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System.Threading.Tasks;
#nullable enable

using System.Threading.Tasks;
using Hertzole.GameJolt;
using NSubstitute;
using NUnit.Framework;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public async Task Singleton_SingleInstance()

await WaitFramesAsync(1);

GameJoltManager sceneInstance = Object.FindObjectOfType<GameJoltManager>();
GameJoltManager sceneInstance = FindObject<GameJoltManager>();

Assert.That(sceneInstance == null, Is.False, "GameJoltManager in scene is null.");
Assert.That(sceneInstance, Is.EqualTo(GameJoltManager.instance), "GameJoltManager in scene is not the same as the instance.");
Expand Down Expand Up @@ -355,15 +355,15 @@ public async Task AutoPingSessions_SessionPinged()
[Test]
public async Task Initialize_CreatesSingleton()
{
GameJoltManager[]? managers = Object.FindObjectsOfType<GameJoltManager>();
GameJoltManager[]? managers = FindObjects<GameJoltManager>();

Assert.That(managers.Length, Is.EqualTo(0), "There are managers in the scene.");

GameJoltManager.Initialize();

await WaitFramesAsync(1);

managers = Object.FindObjectsOfType<GameJoltManager>();
managers = FindObjects<GameJoltManager>();

Assert.That(managers.Length, Is.EqualTo(1), "There are no managers in the scene.");

Expand All @@ -377,7 +377,7 @@ public async Task Initialize_ExistingSingleton()

GameJoltManager.Initialize();

GameJoltManager[]? managers = Object.FindObjectsOfType<GameJoltManager>();
GameJoltManager[]? managers = FindObjects<GameJoltManager>();

Assert.That(managers.Length, Is.EqualTo(1), "There are no managers in the scene.");

Expand All @@ -398,6 +398,24 @@ private static async Task WaitFramesAsync(int frames)
await Task.Yield();
}
}

private static T FindObject<T>() where T : Object
{
#if UNITY_2023_1_OR_NEWER
return Object.FindFirstObjectByType<T>();
#else
return Object.FindObjectOfType<T>();
#endif
}

private static T[] FindObjects<T>() where T : Object
{
#if UNITY_2023_1_OR_NEWER
return Object.FindObjectsByType<T>(FindObjectsSortMode.None);
#else
return Object.FindObjectsOfType<T>();
#endif
}
}
}
#endif

0 comments on commit acd83aa

Please sign in to comment.