From a41164020f795b4c1cc2256cbf8f7f0de3c15535 Mon Sep 17 00:00:00 2001
From: eickern <git@nikl.me>
Date: Tue, 21 Feb 2023 20:45:11 +0100
Subject: [PATCH] Init states before adding loading states

---
 .../tests/continues_without_collection.rs       |  2 +-
 bevy_asset_loader/tests/init_resource.rs        |  2 +-
 .../tests/multiple_asset_collections.rs         |  2 +-
 .../tests/multiple_loading_states.rs            | 17 +++--------------
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/bevy_asset_loader/tests/continues_without_collection.rs b/bevy_asset_loader/tests/continues_without_collection.rs
index c9c1db5..3e8e338 100644
--- a/bevy_asset_loader/tests/continues_without_collection.rs
+++ b/bevy_asset_loader/tests/continues_without_collection.rs
@@ -41,7 +41,7 @@ struct TestState {
 
 impl Default for TestState {
     fn default() -> Self {
-        TestState { wait_frames: 1 }
+        TestState { wait_frames: 4 }
     }
 }
 
diff --git a/bevy_asset_loader/tests/init_resource.rs b/bevy_asset_loader/tests/init_resource.rs
index 5e4c8f2..2f89667 100644
--- a/bevy_asset_loader/tests/init_resource.rs
+++ b/bevy_asset_loader/tests/init_resource.rs
@@ -15,13 +15,13 @@ use bevy_asset_loader::loading_state::{LoadingState, LoadingStateAppExt};
 #[test]
 fn init_resource() {
     App::new()
+        .add_state::<MyStates>()
         .add_plugins(MinimalPlugins)
         .add_plugin(AssetPlugin::default())
         .add_plugin(AudioPlugin::default())
         .add_loading_state(LoadingState::new(MyStates::Load).continue_to_state(MyStates::Next))
         .add_collection_to_loading_state::<_, MyAssets>(MyStates::Load)
         .init_resource_after_loading_state::<_, PostProcessed>(MyStates::Load)
-        .add_state::<MyStates>()
         .add_system(timeout.run_if(in_state(MyStates::Load)))
         .add_system_to_schedule(OnEnter(MyStates::Next), expect)
         .run();
diff --git a/bevy_asset_loader/tests/multiple_asset_collections.rs b/bevy_asset_loader/tests/multiple_asset_collections.rs
index bb8eb29..911bfd6 100644
--- a/bevy_asset_loader/tests/multiple_asset_collections.rs
+++ b/bevy_asset_loader/tests/multiple_asset_collections.rs
@@ -15,13 +15,13 @@ use bevy_asset_loader::loading_state::{LoadingState, LoadingStateAppExt};
 #[test]
 fn multiple_asset_collections() {
     App::new()
+        .add_state::<MyStates>()
         .add_plugins(MinimalPlugins)
         .add_plugin(AssetPlugin::default())
         .add_plugin(AudioPlugin::default())
         .add_loading_state(LoadingState::new(MyStates::Load).continue_to_state(MyStates::Next))
         .add_collection_to_loading_state::<_, PlopAudio>(MyStates::Load)
         .add_collection_to_loading_state::<_, BackgroundAudio>(MyStates::Load)
-        .add_state::<MyStates>()
         .add_system(timeout.run_if(in_state(MyStates::Load)))
         .add_system_to_schedule(OnEnter(MyStates::Next), expect)
         .run();
diff --git a/bevy_asset_loader/tests/multiple_loading_states.rs b/bevy_asset_loader/tests/multiple_loading_states.rs
index 2f15693..ac07b85 100644
--- a/bevy_asset_loader/tests/multiple_loading_states.rs
+++ b/bevy_asset_loader/tests/multiple_loading_states.rs
@@ -1,17 +1,9 @@
-#![allow(dead_code, unused_imports)]
-
 use bevy::app::AppExit;
-use bevy::asset::AssetPlugin;
 use bevy::audio::AudioPlugin;
 use bevy::prelude::*;
 use bevy_asset_loader::asset_collection::AssetCollection;
 use bevy_asset_loader::loading_state::{LoadingState, LoadingStateAppExt};
 
-#[cfg(all(
-    not(feature = "2d"),
-    not(feature = "3d"),
-    not(feature = "progress_tracking")
-))]
 #[test]
 fn multiple_loading_states() {
     App::new()
@@ -21,10 +13,6 @@ fn multiple_loading_states() {
         .add_plugin(AudioPlugin::default())
         .add_loading_state(LoadingState::new(MyStates::Splash).continue_to_state(MyStates::Load))
         .add_collection_to_loading_state::<_, SplashAssets>(MyStates::Splash)
-        .add_loading_state(LoadingState::new(MyStates::Load).continue_to_state(MyStates::Play))
-        .add_collection_to_loading_state::<_, MyOtherAssets>(MyStates::Load)
-        .add_loading_state(LoadingState::new(MyStates::Load).continue_to_state(MyStates::Play))
-        .add_collection_to_loading_state::<_, MyAssets>(MyStates::Load)
         .add_system(timeout)
         .add_system_to_schedule(OnEnter(MyStates::Load), use_splash_assets)
         .add_system_to_schedule(OnEnter(MyStates::Play), use_loading_assets)
@@ -33,7 +21,8 @@ fn multiple_loading_states() {
 }
 
 fn timeout(time: Res<Time>) {
-    if time.elapsed_seconds_f64() > 30. {
+    println!("Frame");
+    if time.elapsed_seconds_f64() > 5. {
         panic!("The app did not finish in 30 seconds");
     }
 }
@@ -47,7 +36,7 @@ fn use_loading_assets(_my_assets: Res<MyAssets>, _my_other_assets: Res<MyOtherAs
 }
 
 fn quit(mut exit: EventWriter<AppExit>) {
-    println!("Everything fine, quitting the app");
+    info!("Everything fine, quitting the app");
     exit.send(AppExit);
 }