fix some tests

Author: IsseW

crates/viewer/re_blueprint_tree/tests/blueprint_tree_tests.rs

@@ -6,11 +6,13 @@ use egui_kittest::{OsThreshold, SnapshotOptions};
 use re_blueprint_tree::BlueprintTree;
 use re_chunk_store::RowId;
 use re_chunk_store::external::re_chunk::ChunkBuilder;
-use re_log_types::{Timeline, build_frame_nr};
+use re_log_types::{TimelineName, build_frame_nr};
 use re_test_context::TestContext;
 use re_test_viewport::TestContextExt as _;
 use re_types::archetypes::Points3D;
-use re_viewer_context::{CollapseScope, RecommendedView, ViewClass as _, ViewId};
+use re_viewer_context::{
+    CollapseScope, RecommendedView, TimeBlueprintExt as _, ViewClass as _, ViewId,
+};
 use re_viewport_blueprint::{ViewBlueprint, ViewportBlueprint};
 
 #[test]
@@ -28,7 +30,7 @@ fn basic_blueprint_panel_should_match_snapshot() {
     });
 
     let blueprint_tree = BlueprintTree::default();
-    run_blueprint_panel_and_save_snapshot(test_context, blueprint_tree, "basic_blueprint_panel");
+    run_blueprint_panel_and_save_snapshot(&test_context, blueprint_tree, "basic_blueprint_panel");
 }
 
 // ---
@@ -61,7 +63,9 @@ fn collapse_expand_all_blueprint_panel_should_match_snapshot() {
         let mut blueprint_tree = BlueprintTree::default();
 
         // set the current timeline to the timeline where data was logged to
-        test_context.set_active_timeline(Timeline::new_sequence("frame_nr"));
+        test_context.with_blueprint_ctx(|ctx| {
+            ctx.set_timeline(TimelineName::new("frame_nr"));
+        });
 
         let mut harness = test_context
             .setup_kittest_for_rendering()
@@ -103,7 +107,7 @@ fn blueprint_panel_filter_active_inside_origin_should_match_snapshot() {
     let (test_context, blueprint_tree) = setup_filter_test(Some("left"));
 
     run_blueprint_panel_and_save_snapshot(
-        test_context,
+        &test_context,
         blueprint_tree,
         "blueprint_panel_filter_active_inside_origin",
     );
@@ -114,7 +118,7 @@ fn blueprint_panel_filter_active_outside_origin_should_match_snapshot() {
     let (test_context, blueprint_tree) = setup_filter_test(Some("out"));
 
     run_blueprint_panel_and_save_snapshot(
-        test_context,
+        &test_context,
         blueprint_tree,
         "blueprint_panel_filter_active_outside_origin",
     );
@@ -125,7 +129,7 @@ fn blueprint_panel_filter_active_above_origin_should_match_snapshot() {
     let (test_context, blueprint_tree) = setup_filter_test(Some("path"));
 
     run_blueprint_panel_and_save_snapshot(
-        test_context,
+        &test_context,
         blueprint_tree,
         "blueprint_panel_filter_active_above_origin",
     );
@@ -182,12 +186,14 @@ fn add_point_to_chunk_builder(builder: ChunkBuilder) -> ChunkBuilder {
 }
 
 fn run_blueprint_panel_and_save_snapshot(
-    mut test_context: TestContext,
+    test_context: &TestContext,
     mut blueprint_tree: BlueprintTree,
     snapshot_name: &str,
 ) {
     // set the current timeline to the timeline where data was logged to
-    test_context.set_active_timeline(Timeline::new_sequence("frame_nr"));
+    test_context.with_blueprint_ctx(|ctx| {
+        ctx.set_timeline(TimelineName::new("frame_nr"));
+    });
 
     let mut harness = test_context
         .setup_kittest_for_rendering()

crates/viewer/re_blueprint_tree/tests/range_selection_test.rs

@@ -5,11 +5,11 @@ use egui_kittest::{OsThreshold, SnapshotOptions, kittest::Queryable as _};
 use re_blueprint_tree::BlueprintTree;
 use re_chunk_store::RowId;
 use re_chunk_store::external::re_chunk::ChunkBuilder;
-use re_log_types::{Timeline, build_frame_nr};
+use re_log_types::{TimelineName, build_frame_nr};
 use re_test_context::TestContext;
 use re_test_viewport::TestContextExt as _;
 use re_types::archetypes::Points3D;
-use re_viewer_context::{Contents, ViewClass as _, VisitorControlFlow};
+use re_viewer_context::{Contents, TimeBlueprintExt as _, ViewClass as _, VisitorControlFlow};
 use re_viewport_blueprint::{ViewBlueprint, ViewportBlueprint};
 
 #[test]
@@ -29,7 +29,9 @@ fn test_range_selection_in_blueprint_tree() {
     let mut blueprint_tree = BlueprintTree::default();
 
     // set the current timeline to the timeline where data was logged to
-    test_context.set_active_timeline(Timeline::new_sequence("frame_nr"));
+    test_context.with_blueprint_ctx(|ctx| {
+        ctx.set_timeline(TimelineName::new("frame_nr"));
+    });
 
     let mut harness = test_context
         .setup_kittest_for_rendering()

crates/viewer/re_blueprint_tree/tests/view_structure_test.rs

@@ -11,12 +11,12 @@ use re_blueprint_tree::BlueprintTree;
 use re_blueprint_tree::data::BlueprintTreeData;
 use re_chunk_store::RowId;
 use re_chunk_store::external::re_chunk::ChunkBuilder;
-use re_log_types::{EntityPath, Timeline, build_frame_nr};
+use re_log_types::{EntityPath, TimelineName, build_frame_nr};
 use re_test_context::TestContext;
 use re_test_viewport::TestContextExt as _;
 use re_types::archetypes::Points3D;
 use re_ui::filter_widget::FilterState;
-use re_viewer_context::{RecommendedView, ViewClass as _, ViewId};
+use re_viewer_context::{RecommendedView, TimeBlueprintExt as _, ViewClass as _, ViewId};
 use re_viewport_blueprint::{ViewBlueprint, ViewportBlueprint};
 
 const VIEW_ID: &str = "this-is-a-view-id";
@@ -163,7 +163,7 @@ fn test_all_snapshot_test_cases() {
 }
 
 fn run_test_case(test_case: &TestCase, filter_query: Option<&str>) -> Result<(), SnapshotError> {
-    let mut test_context = test_context(test_case);
+    let test_context = test_context(test_case);
     let view_id = ViewId::hashed_from_str(VIEW_ID);
 
     let mut blueprint_tree = BlueprintTree::default();
@@ -183,7 +183,9 @@ fn run_test_case(test_case: &TestCase, filter_query: Option<&str>) -> Result<(),
     }
 
     // set the current timeline to the timeline where data was logged to
-    test_context.set_active_timeline(Timeline::new_sequence("frame_nr"));
+    test_context.with_blueprint_ctx(|ctx| {
+        ctx.set_timeline(TimelineName::new("frame_nr"));
+    });
 
     let mut harness = test_context
         .setup_kittest_for_rendering()

crates/viewer/re_time_panel/tests/time_panel_filter_tests.rs

@@ -116,7 +116,7 @@ fn add_point_to_chunk_builder(builder: ChunkBuilder) -> ChunkBuilder {
 }
 
 fn run_time_panel_and_save_snapshot(
-    mut test_context: TestContext,
+    test_context: TestContext,
     mut time_panel: TimePanel,
     snapshot_name: &str,
 ) {

crates/viewer/re_time_panel/tests/time_panel_tests.rs

@@ -5,13 +5,14 @@ use egui::Vec2;
 use re_chunk_store::{LatestAtQuery, RowId};
 use re_entity_db::InstancePath;
 use re_log_types::{
-    AbsoluteTimeRange, EntityPath, TimeInt, TimePoint, TimeType, Timeline, build_frame_nr,
+    AbsoluteTimeRange, EntityPath, TimeInt, TimePoint, TimeType, Timeline, TimelineName,
+    build_frame_nr,
     example_components::{MyPoint, MyPoints},
 };
 use re_test_context::{TestContext, external::egui_kittest::SnapshotOptions};
 use re_time_panel::TimePanel;
 use re_types::archetypes::Points2D;
-use re_viewer_context::{CollapseScope, TimeView, blueprint_timeline};
+use re_viewer_context::{CollapseScope, TimeBlueprintExt as _, TimeView, blueprint_timeline};
 use re_viewport_blueprint::ViewportBlueprint;
 
 fn add_sparse_data(test_context: &mut TestContext) {
@@ -39,7 +40,7 @@ pub fn time_panel_two_sections() {
     add_sparse_data(&mut test_context);
 
     run_time_panel_and_save_snapshot(
-        &mut test_context,
+        &test_context,
         TimePanel::default(),
         300.0,
         false,
@@ -63,7 +64,7 @@ pub fn time_panel_two_sections_with_valid_range() {
     }
 
     run_time_panel_and_save_snapshot(
-        &mut test_context,
+        &test_context,
         TimePanel::default(),
         300.0,
         false,
@@ -79,7 +80,7 @@ pub fn time_panel_two_sections_with_valid_range() {
         });
     }
     run_time_panel_and_save_snapshot(
-        &mut test_context,
+        &test_context,
         TimePanel::default(),
         300.0,
         false,
@@ -109,7 +110,7 @@ pub fn time_panel_two_sections_with_two_valid_ranges() {
     }
 
     run_time_panel_and_save_snapshot(
-        &mut test_context,
+        &test_context,
         TimePanel::default(),
         300.0,
         false,
@@ -125,7 +126,7 @@ pub fn time_panel_two_sections_with_two_valid_ranges() {
         });
     }
     run_time_panel_and_save_snapshot(
-        &mut test_context,
+        &test_context,
         TimePanel::default(),
         300.0,
         false,
@@ -165,7 +166,7 @@ pub fn time_panel_dense_data() {
     });
 
     run_time_panel_and_save_snapshot(
-        &mut test_context,
+        &test_context,
         TimePanel::default(),
         300.0,
         false,
@@ -243,11 +244,12 @@ pub fn test_various_entity_kinds_in_time_panel() {
 
             log_data_for_various_entity_kinds_tests(&mut test_context);
 
-            test_context
-                .recording_config
-                .time_ctrl
-                .write()
-                .set_timeline_and_time(Timeline::new(timeline, TimeType::Sequence), time);
+            test_context.with_blueprint_ctx(|ctx| {
+                ctx.set_timeline_and_time(
+                    TimelineName::new(timeline),
+                    TimeInt::saturated_temporal_i64(time),
+                );
+            });
 
             test_context
                 .recording_config
@@ -358,7 +360,7 @@ pub fn log_static_data(test_context: &mut TestContext, entity_path: impl Into<En
 }
 
 fn run_time_panel_and_save_snapshot(
-    test_context: &mut TestContext,
+    test_context: &TestContext,
     mut time_panel: TimePanel,
     height: f32,
     expand_all: bool,

crates/viewer/re_viewer/src/app.rs

@@ -1153,7 +1153,7 @@ impl App {
             self.command_sender
                 .send_system(SystemCommand::SetActiveTime {
                     store_id,
-                    timeline: timeline,
+                    timeline,
                     time: Some(timecell.value.into()),
                 });
         }
@@ -3357,6 +3357,8 @@ impl BlueprintContext for AppBlueprintCtx<'_> {
         &self.blueprint_query
     }
 }
+
+/// Build a [`AppBlueprintCtx`] to interact with the active blueprint.
 fn blueprint_ctx<'a>(
     app_state: &mut AppState,
     command_sender: &'a CommandSender,