2023-05-01 18:00:01 +00:00
|
|
|
//! Utilities for testing in CI environments.
|
|
|
|
|
2023-03-18 01:45:34 +00:00
|
|
|
use crate::{app::AppExit, App, Update};
|
2022-04-05 22:36:02 +00:00
|
|
|
use serde::Deserialize;
|
2021-04-14 21:40:36 +00:00
|
|
|
|
Make `Resource` trait opt-in, requiring `#[derive(Resource)]` V2 (#5577)
*This PR description is an edited copy of #5007, written by @alice-i-cecile.*
# Objective
Follow-up to https://github.com/bevyengine/bevy/pull/2254. The `Resource` trait currently has a blanket implementation for all types that meet its bounds.
While ergonomic, this results in several drawbacks:
* it is possible to make confusing, silent mistakes such as inserting a function pointer (Foo) rather than a value (Foo::Bar) as a resource
* it is challenging to discover if a type is intended to be used as a resource
* we cannot later add customization options (see the [RFC](https://github.com/bevyengine/rfcs/blob/main/rfcs/27-derive-component.md) for the equivalent choice for Component).
* dependencies can use the same Rust type as a resource in invisibly conflicting ways
* raw Rust types used as resources cannot preserve privacy appropriately, as anyone able to access that type can read and write to internal values
* we cannot capture a definitive list of possible resources to display to users in an editor
## Notes to reviewers
* Review this commit-by-commit; there's effectively no back-tracking and there's a lot of churn in some of these commits.
*ira: My commits are not as well organized :')*
* I've relaxed the bound on Local to Send + Sync + 'static: I don't think these concerns apply there, so this can keep things simple. Storing e.g. a u32 in a Local is fine, because there's a variable name attached explaining what it does.
* I think this is a bad place for the Resource trait to live, but I've left it in place to make reviewing easier. IMO that's best tackled with https://github.com/bevyengine/bevy/issues/4981.
## Changelog
`Resource` is no longer automatically implemented for all matching types. Instead, use the new `#[derive(Resource)]` macro.
## Migration Guide
Add `#[derive(Resource)]` to all types you are using as a resource.
If you are using a third party type as a resource, wrap it in a tuple struct to bypass orphan rules. Consider deriving `Deref` and `DerefMut` to improve ergonomics.
`ClearColor` no longer implements `Component`. Using `ClearColor` as a component in 0.8 did nothing.
Use the `ClearColorConfig` in the `Camera3d` and `Camera2d` components instead.
Co-authored-by: Alice <alice.i.cecile@gmail.com>
Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
Co-authored-by: devil-ira <justthecooldude@gmail.com>
Co-authored-by: Carter Anderson <mcanders1@gmail.com>
2022-08-08 21:36:35 +00:00
|
|
|
use bevy_ecs::prelude::Resource;
|
2022-06-06 20:22:51 +00:00
|
|
|
use bevy_utils::tracing::info;
|
|
|
|
|
2022-04-05 22:36:02 +00:00
|
|
|
/// A configuration struct for automated CI testing.
|
|
|
|
///
|
|
|
|
/// It gets used when the `bevy_ci_testing` feature is enabled to automatically
|
|
|
|
/// exit a Bevy app when run through the CI. This is needed because otherwise
|
|
|
|
/// Bevy apps would be stuck in the game loop and wouldn't allow the CI to progress.
|
Make `Resource` trait opt-in, requiring `#[derive(Resource)]` V2 (#5577)
*This PR description is an edited copy of #5007, written by @alice-i-cecile.*
# Objective
Follow-up to https://github.com/bevyengine/bevy/pull/2254. The `Resource` trait currently has a blanket implementation for all types that meet its bounds.
While ergonomic, this results in several drawbacks:
* it is possible to make confusing, silent mistakes such as inserting a function pointer (Foo) rather than a value (Foo::Bar) as a resource
* it is challenging to discover if a type is intended to be used as a resource
* we cannot later add customization options (see the [RFC](https://github.com/bevyengine/rfcs/blob/main/rfcs/27-derive-component.md) for the equivalent choice for Component).
* dependencies can use the same Rust type as a resource in invisibly conflicting ways
* raw Rust types used as resources cannot preserve privacy appropriately, as anyone able to access that type can read and write to internal values
* we cannot capture a definitive list of possible resources to display to users in an editor
## Notes to reviewers
* Review this commit-by-commit; there's effectively no back-tracking and there's a lot of churn in some of these commits.
*ira: My commits are not as well organized :')*
* I've relaxed the bound on Local to Send + Sync + 'static: I don't think these concerns apply there, so this can keep things simple. Storing e.g. a u32 in a Local is fine, because there's a variable name attached explaining what it does.
* I think this is a bad place for the Resource trait to live, but I've left it in place to make reviewing easier. IMO that's best tackled with https://github.com/bevyengine/bevy/issues/4981.
## Changelog
`Resource` is no longer automatically implemented for all matching types. Instead, use the new `#[derive(Resource)]` macro.
## Migration Guide
Add `#[derive(Resource)]` to all types you are using as a resource.
If you are using a third party type as a resource, wrap it in a tuple struct to bypass orphan rules. Consider deriving `Deref` and `DerefMut` to improve ergonomics.
`ClearColor` no longer implements `Component`. Using `ClearColor` as a component in 0.8 did nothing.
Use the `ClearColorConfig` in the `Camera3d` and `Camera2d` components instead.
Co-authored-by: Alice <alice.i.cecile@gmail.com>
Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
Co-authored-by: devil-ira <justthecooldude@gmail.com>
Co-authored-by: Carter Anderson <mcanders1@gmail.com>
2022-08-08 21:36:35 +00:00
|
|
|
#[derive(Deserialize, Resource)]
|
2021-04-14 21:40:36 +00:00
|
|
|
pub struct CiTestingConfig {
|
2022-04-05 22:36:02 +00:00
|
|
|
/// The number of frames after which Bevy should exit.
|
2021-04-14 21:40:36 +00:00
|
|
|
pub exit_after: Option<u32>,
|
2023-05-01 18:00:01 +00:00
|
|
|
/// The time in seconds to update for each frame.
|
|
|
|
pub frame_time: Option<f32>,
|
|
|
|
/// Frames at which to capture a screenshot.
|
|
|
|
#[serde(default)]
|
|
|
|
pub screenshot_frames: Vec<u32>,
|
2021-04-14 21:40:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn ci_testing_exit_after(
|
|
|
|
mut current_frame: bevy_ecs::prelude::Local<u32>,
|
|
|
|
ci_testing_config: bevy_ecs::prelude::Res<CiTestingConfig>,
|
2022-03-01 19:33:56 +00:00
|
|
|
mut app_exit_events: bevy_ecs::event::EventWriter<AppExit>,
|
2021-04-14 21:40:36 +00:00
|
|
|
) {
|
|
|
|
if let Some(exit_after) = ci_testing_config.exit_after {
|
|
|
|
if *current_frame > exit_after {
|
|
|
|
app_exit_events.send(AppExit);
|
2022-06-06 20:22:51 +00:00
|
|
|
info!("Exiting after {} frames. Test successful!", exit_after);
|
2021-04-14 21:40:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
*current_frame += 1;
|
|
|
|
}
|
|
|
|
|
2021-07-02 01:05:20 +00:00
|
|
|
pub(crate) fn setup_app(app: &mut App) -> &mut App {
|
2022-06-06 20:22:51 +00:00
|
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
|
|
let config: CiTestingConfig = {
|
|
|
|
let filename = std::env::var("CI_TESTING_CONFIG")
|
|
|
|
.unwrap_or_else(|_| "ci_testing_config.ron".to_string());
|
|
|
|
ron::from_str(
|
|
|
|
&std::fs::read_to_string(filename)
|
|
|
|
.expect("error reading CI testing configuration file"),
|
|
|
|
)
|
|
|
|
.expect("error deserializing CI testing configuration file")
|
|
|
|
};
|
|
|
|
#[cfg(target_arch = "wasm32")]
|
|
|
|
let config: CiTestingConfig = {
|
|
|
|
let config = include_str!("../../../ci_testing_config.ron");
|
|
|
|
ron::from_str(config).expect("error deserializing CI testing configuration file")
|
|
|
|
};
|
|
|
|
|
2021-07-02 01:05:20 +00:00
|
|
|
app.insert_resource(config)
|
2023-03-18 01:45:34 +00:00
|
|
|
.add_systems(Update, ci_testing_exit_after);
|
2021-04-14 21:40:36 +00:00
|
|
|
|
2021-07-02 01:05:20 +00:00
|
|
|
app
|
2021-04-14 21:40:36 +00:00
|
|
|
}
|