fix snapshot tests

Author: IsseW

crates/viewer/re_test_context/src/lib.rs

@@ -200,6 +200,8 @@ impl TestContext {
                 blueprint_query: &blueprint_query,
             };
 
+            // ctx.set_timeline("log_tick".into());
+
             RecordingConfig::from_blueprint(&ctx)
         };
 
@@ -346,12 +348,19 @@ impl TestContext {
             panic!("No active blueprint")
         };
 
-        f(TestBlueprintCtx {
+        let r = f(TestBlueprintCtx {
             command_sender: &self.command_sender,
             current_blueprint: store_context.blueprint,
             default_blueprint: store_context.default_blueprint,
             blueprint_query: &self.blueprint_query,
-        })
+        });
+
+        drop(store_hub);
+
+        // Handle system commands directly after updating blueprints to write it to the store.
+        self.handle_system_commands();
+
+        r
     }
 
     pub fn setup_kittest_for_rendering(&self) -> egui_kittest::HarnessBuilder<()> {
@@ -495,13 +504,10 @@ impl TestContext {
             drag_and_drop_manager: &drag_and_drop_manager,
         };
 
-        self.recording_config.time_ctrl.write().update(
-            store_context.recording.times_per_timeline(),
-            0.0,
-            false,
-            true,
-            &ctx,
-        );
+        self.recording_config
+            .time_ctrl
+            .write()
+            .update_from_blueprint(&ctx, Some(store_context.recording.times_per_timeline()));
 
         func(&ctx);
 

crates/viewer/re_time_panel/tests/snapshots/various_entity_kinds_timeline_a_0.png

@@ -1,7 +1,7 @@
 #![expect(clippy::unwrap_used)] // It's a test!
 
 use re_chunk_store::RowId;
-use re_log_types::{NonMinI64, TimePoint};
+use re_log_types::{NonMinI64, TimeInt, TimePoint};
 use re_test_context::{TestContext, external::egui_kittest::SnapshotOptions};
 use re_test_viewport::TestContextExt as _;
 use re_types::{
@@ -287,7 +287,9 @@ fn test_video(video_type: VideoType, codec: VideoCodec) {
         // not tearing down the video player!
         let desired_seek_ns = seek_location.get_time_ns(&frame_timestamps_nanos);
         test_context.with_blueprint_ctx(|ctx| {
-            ctx.set_time(NonMinI64::new(desired_seek_ns).unwrap());
+            ctx.set_time(TimeInt::from_nanos(
+                NonMinI64::new(desired_seek_ns).unwrap(),
+            ));
         });
 
         // Video decoding happens in a different thread, so it's important that we give it time

crates/viewer/re_time_panel/tests/snapshots/various_entity_kinds_timeline_a_5.png

@@ -3,7 +3,7 @@ use re_log_types::{EntityPath, TimePoint, Timeline};
 use re_test_context::{TestContext, external::egui_kittest::SnapshotOptions};
 use re_test_viewport::TestContextExt as _;
 use re_view_time_series::TimeSeriesView;
-use re_viewer_context::{BlueprintContext as _, ViewClass as _, ViewId};
+use re_viewer_context::{BlueprintContext as _, TimeBlueprintExt as _, ViewClass as _, ViewId};
 use re_viewport_blueprint::{ViewBlueprint, ViewContents};
 
 fn color_gradient0(step: i64) -> re_types::components::Color {
@@ -24,6 +24,8 @@ pub fn test_clear_series_points_and_line() {
 fn test_clear_series_points_and_line_impl(two_series_per_entity: bool) {
     let mut test_context = TestContext::new_with_view_class::<TimeSeriesView>();
 
+    let timeline = Timeline::log_tick();
+
     // TODO(#10512): Potentially fix up this after we have "markers".
     // There are some intricacies involved with this test. `SeriesLines` and
     // `SeriesPoints` can both be logged without any associated data (all
@@ -50,7 +52,7 @@ fn test_clear_series_points_and_line_impl(two_series_per_entity: bool) {
     });
 
     for i in 0..32 {
-        let timepoint = TimePoint::from([(test_context.active_timeline(), i)]);
+        let timepoint = TimePoint::from([(timeline, i)]);
 
         match i {
             15 => {
@@ -85,6 +87,10 @@ fn test_clear_series_points_and_line_impl(two_series_per_entity: bool) {
         }
     }
 
+    test_context.with_blueprint_ctx(|ctx| {
+        ctx.set_timeline(*timeline.name());
+    });
+
     let allowed_broken_pixels = if two_series_per_entity { 5 } else { 2 };
     let view_id = setup_blueprint(&mut test_context);
     test_context.run_view_ui_and_save_snapshot(
@@ -136,6 +142,8 @@ fn test_line_properties() {
 fn test_line_properties_impl(multiple_properties: bool, multiple_scalars: bool) {
     let mut test_context = TestContext::new_with_view_class::<TimeSeriesView>();
 
+    let timeline = Timeline::log_tick();
+
     let properties_static = if multiple_properties {
         re_types::archetypes::SeriesLines::new()
             .with_widths([4.0, 8.0])
@@ -155,7 +163,7 @@ fn test_line_properties_impl(multiple_properties: bool, multiple_scalars: bool)
     });
 
     for step in 0..32 {
-        let timepoint = TimePoint::from([(test_context.active_timeline(), step)]);
+        let timepoint = TimePoint::from([(timeline, step)]);
 
         let properties = if multiple_properties {
             re_types::archetypes::SeriesLines::new()
@@ -181,6 +189,10 @@ fn test_line_properties_impl(multiple_properties: bool, multiple_scalars: bool)
         });
     }
 
+    test_context.with_blueprint_ctx(|ctx| {
+        ctx.set_timeline(*timeline.name());
+    });
+
     let view_id = setup_blueprint(&mut test_context);
     let mut name = "line_properties".to_owned();
     if multiple_properties {
@@ -208,6 +220,8 @@ fn test_per_series_visibility() {
     ] {
         let mut test_context = TestContext::new_with_view_class::<TimeSeriesView>();
 
+        let timeline = Timeline::log_tick();
+
         test_context.log_entity("plots", |builder| {
             builder.with_archetype(
                 RowId::new(),
@@ -217,13 +231,17 @@ fn test_per_series_visibility() {
         });
 
         for step in 0..32 {
-            let timepoint = TimePoint::from([(test_context.active_timeline(), step)]);
+            let timepoint = TimePoint::from([(timeline, step)]);
             let (scalars, _) = scalars_for_properties_test(step, true);
             test_context.log_entity("plots", |builder| {
                 builder.with_archetype(RowId::new(), timepoint.clone(), &scalars)
             });
         }
 
+        test_context.with_blueprint_ctx(|ctx| {
+            ctx.set_timeline(*timeline.name());
+        });
+
         let view_id = setup_blueprint(&mut test_context);
         test_context.run_view_ui_and_save_snapshot(view_id, name, egui::vec2(300.0, 300.0), None);
     }
@@ -253,6 +271,8 @@ fn test_point_properties() {
 fn test_point_properties_impl(multiple_properties: bool, multiple_scalars: bool) {
     let mut test_context = TestContext::new_with_view_class::<TimeSeriesView>();
 
+    let timeline = Timeline::log_tick();
+
     let static_props = if multiple_properties {
         re_types::archetypes::SeriesPoints::new()
             .with_marker_sizes([4.0, 8.0])
@@ -278,7 +298,7 @@ fn test_point_properties_impl(multiple_properties: bool, multiple_scalars: bool)
     });
 
     for step in 0..32 {
-        let timepoint = TimePoint::from([(test_context.active_timeline(), step)]);
+        let timepoint = TimePoint::from([(timeline, step)]);
 
         let properties = if multiple_properties {
             re_types::archetypes::SeriesPoints::new()
@@ -308,6 +328,10 @@ fn test_point_properties_impl(multiple_properties: bool, multiple_scalars: bool)
         });
     }
 
+    test_context.with_blueprint_ctx(|ctx| {
+        ctx.set_timeline(*timeline.name());
+    });
+
     let view_id = setup_blueprint(&mut test_context);
     let mut name = "point_properties".to_owned();
     if multiple_properties {
@@ -399,6 +423,10 @@ fn test_bootstrapped_secondaries_impl(partial_range: bool) {
         blueprint.add_view_at_root(view)
     });
 
+    test_context.with_blueprint_ctx(|ctx| {
+        ctx.set_timeline(*Timeline::log_tick().name());
+    });
+
     let name = if partial_range {
         "bootstrapped_secondaries_partial"
     } else {