From 706f0ac4c0b3df8c25ab8754f766bcb8170bc092 Mon Sep 17 00:00:00 2001 From: alexiscatnip Date: Mon, 11 Jul 2022 21:31:24 +0800 Subject: [PATCH] improve code quality of headless scene loader (used only in test) --- .../Helpers/SceneLoader.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Assets/Tests/Raindrop/RaindropIntegrationTests/Helpers/SceneLoader.cs b/Assets/Tests/Raindrop/RaindropIntegrationTests/Helpers/SceneLoader.cs index 87fa442..4d6628c 100644 --- a/Assets/Tests/Raindrop/RaindropIntegrationTests/Helpers/SceneLoader.cs +++ b/Assets/Tests/Raindrop/RaindropIntegrationTests/Helpers/SceneLoader.cs @@ -11,17 +11,21 @@ namespace Raindrop.Tests.RaindropIntegrationTests.Helpers { // load a empty scene with : // - bootstrapper (raindropinstance + servicelocator) - // - mainthreaddispatcher object + // - mainthreaddispatcher gameobject public static IEnumerator LoadHeadlessScene() { - SceneManager.LoadScene("Tests/HeadlessBootstrapScene"); - yield return new WaitForFixedUpdate(); //testing out if this is a ok replacement to just witing an arbitrary amount of seconds. + var loadSceneOperation = + SceneManager.LoadSceneAsync("Tests/HeadlessBootstrapScene"); + while (!loadSceneOperation.isDone) + { + yield return null; + } var bootstrap = GameObject.Find("Bootstrapper"); Assert.True(bootstrap, "bootstrapper object not found"); - - var rdbs = bootstrap.GetComponent(); - Assert.True(rdbs); + var raindropBootstrapper = + bootstrap.GetComponent(); + Assert.True(raindropBootstrapper); var instance = ServiceLocator.Instance.Get(); Assert.True(instance != null); @@ -30,7 +34,6 @@ namespace Raindrop.Tests.RaindropIntegrationTests.Helpers public static void UnloadHeadlessScene() { SceneManager.UnloadSceneAsync("Tests/HeadlessBootstrapScene"); - } } } \ No newline at end of file