Skip to content

Allow setting time overstep in tests #21738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 4, 2025
Merged

Allow setting time overstep in tests #21738

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions crates/bevy_time/src/fixed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,14 @@ impl Time<Fixed> {
self.context().overstep
}

/// Increase the overstep time accumulated towards new steps.
///
/// This method is provided for use in tests. Ordinarily, the [`run_fixed_main_schedule`] system is responsible for calculating the overstep.
#[inline]
pub fn accumulate_overstep(&mut self, delta: Duration) {
self.context_mut().overstep += delta;
}
Comment on lines +185 to +191
Copy link
Contributor Author

@andrewhickman andrewhickman Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is intended for use in tests outside this crate, but AFAIK #[cfg(test)] only works for unit tests within the crate


/// Discard a part of the overstep amount.
///
/// If `discard` is higher than overstep, the overstep becomes zero.
Expand All @@ -205,10 +213,6 @@ impl Time<Fixed> {
self.context().overstep.as_secs_f64() / self.context().timestep.as_secs_f64()
}

fn accumulate(&mut self, delta: Duration) {
self.context_mut().overstep += delta;
}

fn expend(&mut self) -> bool {
let timestep = self.timestep();
if let Some(new_value) = self.context_mut().overstep.checked_sub(timestep) {
Expand Down Expand Up @@ -238,7 +242,9 @@ impl Default for Fixed {
/// [`RunFixedMainLoopSystems`](bevy_app::prelude::RunFixedMainLoopSystems).
pub fn run_fixed_main_schedule(world: &mut World) {
let delta = world.resource::<Time<Virtual>>().delta();
world.resource_mut::<Time<Fixed>>().accumulate(delta);
world
.resource_mut::<Time<Fixed>>()
.accumulate_overstep(delta);

// Run the schedule until we run out of accumulated time
let _ = world.try_schedule_scope(FixedMain, |world, schedule| {
Expand Down Expand Up @@ -278,7 +284,7 @@ mod test {
assert_eq!(time.delta(), Duration::ZERO);
assert_eq!(time.elapsed(), Duration::ZERO);

time.accumulate(Duration::from_secs(1));
time.accumulate_overstep(Duration::from_secs(1));

assert_eq!(time.delta(), Duration::ZERO);
assert_eq!(time.elapsed(), Duration::ZERO);
Expand All @@ -294,7 +300,7 @@ mod test {
assert_eq!(time.overstep_fraction(), 0.5);
assert_eq!(time.overstep_fraction_f64(), 0.5);

time.accumulate(Duration::from_secs(1));
time.accumulate_overstep(Duration::from_secs(1));

assert_eq!(time.delta(), Duration::ZERO);
assert_eq!(time.elapsed(), Duration::ZERO);
Expand All @@ -318,7 +324,7 @@ mod test {
assert_eq!(time.overstep_fraction(), 0.0);
assert_eq!(time.overstep_fraction_f64(), 0.0);

time.accumulate(Duration::from_secs(1));
time.accumulate_overstep(Duration::from_secs(1));

assert_eq!(time.delta(), Duration::from_secs(2));
assert_eq!(time.elapsed(), Duration::from_secs(2));
Expand All @@ -339,7 +345,7 @@ mod test {
fn test_expend_multiple() {
let mut time = Time::<Fixed>::from_seconds(2.0);

time.accumulate(Duration::from_secs(7));
time.accumulate_overstep(Duration::from_secs(7));
assert_eq!(time.overstep(), Duration::from_secs(7));

assert!(time.expend()); // true
Expand Down