Merge pull request #138 from nowsprinting/chore/workaround_awaiter

Workaround Awaitable.Awaiter bug
DeNA · Jan 9, 2025 · b91d362 · b91d362
2 parents 3a7236f + 415d488
commit b91d362
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/Tests/Runtime/AutopilotTest.cs b/Tests/Runtime/AutopilotTest.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2023-2024 DeNA Co., Ltd.
+// Copyright (c) 2023-2025 DeNA Co., Ltd.
 // This software is released under the MIT License.
 
 using System.Collections.Generic;
@@ -195,9 +195,13 @@ public async Task Start_MappedSceneIsNotActiveButLoaded_DispatchAgent()
             const string MappedScenePath = TestScenePath;
             const string ActiveScenePath = TestScenePath2;
 
+            await SceneManagerHelper.LoadSceneAsync(ActiveScenePath);
+            await SceneManagerHelper.LoadSceneAsync(MappedScenePath, LoadSceneMode.Additive);
+            // Note: Workaround for destroy ScriptableObject after await twice bug.
+            Assume.That(SceneManager.GetActiveScene().path, Is.EqualTo(ActiveScenePath), "Mapped scene is not active");
+
             var spyMappedAgent = ScriptableObject.CreateInstance<SpyAgent>();
             var spyFallbackAgent = ScriptableObject.CreateInstance<SpyAgent>();
-
             var autopilotSettings = ScriptableObject.CreateInstance<AutopilotSettings>();
             autopilotSettings.sceneAgentMaps = new List<SceneAgentMap>
             {
@@ -206,10 +210,6 @@ public async Task Start_MappedSceneIsNotActiveButLoaded_DispatchAgent()
             autopilotSettings.fallbackAgent = spyFallbackAgent;
             autopilotSettings.lifespanSec = 1;
 
-            await SceneManagerHelper.LoadSceneAsync(ActiveScenePath);
-            await SceneManagerHelper.LoadSceneAsync(MappedScenePath, LoadSceneMode.Additive);
-            Assume.That(SceneManager.GetActiveScene().path, Is.EqualTo(ActiveScenePath), "Mapped scene is not active");
-
             await Launcher.LaunchAutopilotAsync(autopilotSettings);
 
             Assert.That(spyMappedAgent.CompleteCount, Is.EqualTo(1), "Mapped Agent dispatched");
@@ -224,15 +224,15 @@ public async Task Start_NoMappedSceneInLoadedScenes_DispatchFallbackAgent()
             const string AdditiveScenePath = TestScenePath;
             const string ActiveScenePath = TestScenePath2;
 
-            var spyFallbackAgent = ScriptableObject.CreateInstance<SpyAgent>();
+            await SceneManagerHelper.LoadSceneAsync(ActiveScenePath);
+            await SceneManagerHelper.LoadSceneAsync(AdditiveScenePath, LoadSceneMode.Additive);
+            // Note: Workaround for destroy ScriptableObject after await twice bug.
 
+            var spyFallbackAgent = ScriptableObject.CreateInstance<SpyAgent>();
             var autopilotSettings = ScriptableObject.CreateInstance<AutopilotSettings>();
             autopilotSettings.fallbackAgent = spyFallbackAgent;
             autopilotSettings.lifespanSec = 1;
 
-            await SceneManagerHelper.LoadSceneAsync(ActiveScenePath);
-            await SceneManagerHelper.LoadSceneAsync(AdditiveScenePath, LoadSceneMode.Additive);
-
             await Launcher.LaunchAutopilotAsync(autopilotSettings);
 
             Assert.That(spyFallbackAgent.CompleteCount, Is.EqualTo(1));