diff --git a/tests/render_asset_leaks.rs b/tests/render_asset_leaks.rs index dfcf558c0f..4a61a06515 100644 --- a/tests/render_asset_leaks.rs +++ b/tests/render_asset_leaks.rs @@ -25,8 +25,7 @@ use bevy::{ DefaultPlugins, }; -#[test] -fn check_mesh_leak() { +fn base_app() -> App { let mut app = App::new(); app.add_plugins(( DefaultPlugins @@ -41,6 +40,14 @@ fn check_mesh_leak() { wait_duration: Duration::ZERO, ..Default::default() }, + )); + app +} + +#[test] +fn check_mesh_leak() { + let mut app = base_app(); + app.add_plugins(( RenderAssetDiagnosticPlugin::::new(" meshes"), MeshAllocatorDiagnosticPlugin, )) @@ -61,20 +68,8 @@ fn check_mesh_leak() { #[ignore = "FIXME Failing test"] #[test] fn check_standard_material_leak() { - let mut app = App::new(); + let mut app = base_app(); app.add_plugins(( - DefaultPlugins - .build() - .set(WindowPlugin { - primary_window: None, - exit_condition: ExitCondition::DontExit, - ..Default::default() - }) - .disable::(), - LogDiagnosticsPlugin { - wait_duration: Duration::ZERO, - ..Default::default() - }, RenderAssetDiagnosticPlugin::>::new(" materials"), MaterialAllocatorDiagnosticPlugin::::new(" standard materials"), )) @@ -97,20 +92,8 @@ fn check_standard_material_leak() { #[test] fn check_mesh_churn_leak() { - let mut app = App::new(); + let mut app = base_app(); app.add_plugins(( - DefaultPlugins - .build() - .set(WindowPlugin { - primary_window: None, - exit_condition: ExitCondition::DontExit, - ..Default::default() - }) - .disable::(), - LogDiagnosticsPlugin { - wait_duration: Duration::ZERO, - ..Default::default() - }, RenderAssetDiagnosticPlugin::::new(" meshes"), MeshAllocatorDiagnosticPlugin, )) @@ -128,20 +111,8 @@ fn check_mesh_churn_leak() { #[ignore = "FIXME Failing test"] #[test] fn check_standard_material_churn_leak() { - let mut app = App::new(); + let mut app = base_app(); app.add_plugins(( - DefaultPlugins - .build() - .set(WindowPlugin { - primary_window: None, - exit_condition: ExitCondition::DontExit, - ..Default::default() - }) - .disable::(), - LogDiagnosticsPlugin { - wait_duration: Duration::ZERO, - ..Default::default() - }, RenderAssetDiagnosticPlugin::>::new(" materials"), MaterialAllocatorDiagnosticPlugin::::new(" standard materials"), )) @@ -165,20 +136,8 @@ fn check_standard_material_churn_leak() { #[ignore = "FIXME Failing test"] #[test] fn check_mesh_churn_insert_leak() { - let mut app = App::new(); + let mut app = base_app(); app.add_plugins(( - DefaultPlugins - .build() - .set(WindowPlugin { - primary_window: None, - exit_condition: ExitCondition::DontExit, - ..Default::default() - }) - .disable::(), - LogDiagnosticsPlugin { - wait_duration: Duration::ZERO, - ..Default::default() - }, RenderAssetDiagnosticPlugin::::new(" meshes"), MeshAllocatorDiagnosticPlugin, )) @@ -199,20 +158,8 @@ fn check_mesh_churn_insert_leak() { #[ignore = "FIXME Failing test"] #[test] fn check_standard_material_churn_insert_leak() { - let mut app = App::new(); + let mut app = base_app(); app.add_plugins(( - DefaultPlugins - .build() - .set(WindowPlugin { - primary_window: None, - exit_condition: ExitCondition::DontExit, - ..Default::default() - }) - .disable::(), - LogDiagnosticsPlugin { - wait_duration: Duration::ZERO, - ..Default::default() - }, RenderAssetDiagnosticPlugin::>::new(" materials"), MaterialAllocatorDiagnosticPlugin::::new(" standard materials"), ))