[tests] Regenerate snapshot tests (no system fonts) (#848)

software-mansion · Nov 4, 2024 · 716d243 · 716d243
1 parent 107cb80
commit 716d243
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 19 deletions.
diff --git a/compositor_render/fonts/Inter_18pt-Bold.ttf b/compositor_render/fonts/Inter_18pt-Bold.ttf
diff --git a/compositor_render/src/transformations/text_renderer.rs b/compositor_render/src/transformations/text_renderer.rs
@@ -264,6 +264,11 @@ impl TextRendererCtx {
             .load_font_source(Source::Binary(Arc::new(include_bytes!(
                 "../../fonts/Inter_18pt-Italic.ttf"
             ))));
+        font_system
+            .db_mut()
+            .load_font_source(Source::Binary(Arc::new(include_bytes!(
+                "../../fonts/Inter_18pt-Bold.ttf"
+            ))));
         Self {
             font_system: Mutex::new(font_system),
             swash_cache: Mutex::new(SwashCache::new()),

diff --git a/snapshot_tests/snapshots b/snapshot_tests/snapshots
diff --git a/snapshot_tests/text/align_center.scene.json b/snapshot_tests/text/align_center.scene.json
@@ -8,7 +8,7 @@
                     "type": "text",
                     "text": "Example text",
                     "font_size": 100,
-                    "font_family": "Verdana",
+                    "font_family": "Inter",
                     "align": "center",
                     "width": 1000,
                     "height": 200

diff --git a/snapshot_tests/text/align_right.scene.json b/snapshot_tests/text/align_right.scene.json
@@ -8,7 +8,7 @@
                     "type": "text",
                     "text": "Example text",
                     "font_size": 100,
-                    "font_family": "Verdana",
+                    "font_family": "Inter",
                     "align": "right",
                     "width": 1000,
                     "height": 200

diff --git a/snapshot_tests/text/bold_text.scene.json b/snapshot_tests/text/bold_text.scene.json
@@ -8,7 +8,7 @@
                     "type": "text",
                     "text": "Example text",
                     "font_size": 100,
-                    "font_family": "Verdana",
+                    "font_family": "Inter",
                     "align": "right",
                     "weight": "bold",
                     "width": 1000,

diff --git a/snapshot_tests/text/dimensions_fitted.scene.json b/snapshot_tests/text/dimensions_fitted.scene.json
@@ -8,7 +8,7 @@
                     "type": "text",
                     "text": "Example text",
                     "font_size": 100,
-                    "font_family": "Verdana",
+                    "font_family": "Inter",
                     "background_color_rgba": "#FF0000FF"
                 }
             ]

diff --git a/snapshot_tests/text/dimensions_fitted_column_with_long_text.scene.json b/snapshot_tests/text/dimensions_fitted_column_with_long_text.scene.json
@@ -8,7 +8,7 @@
                     "type": "text",
                     "text": "Example long text that should be longer that underlaying texture.",
                     "font_size": 30,
-                    "font_family": "Verdana",
+                    "font_family": "Inter",
                     "width": 300
                 }
             ]

diff --git a/snapshot_tests/text/dimensions_fitted_column_with_short_text.scene.json b/snapshot_tests/text/dimensions_fitted_column_with_short_text.scene.json
@@ -8,7 +8,7 @@
                     "type": "text",
                     "text": "Example text",
                     "font_size": 30,
-                    "font_family": "Verdana",
+                    "font_family": "Inter",
                     "width": 300
                 }
             ]

diff --git a/snapshot_tests/text/dimensions_fixed.scene.json b/snapshot_tests/text/dimensions_fixed.scene.json
@@ -8,7 +8,7 @@
                     "type": "text",
                     "text": "Example text",
                     "font_size": 100,
-                    "font_family": "Verdana",
+                    "font_family": "Inter",
                     "width": 1000,
                     "height": 200
                 }

diff --git a/snapshot_tests/text/dimensions_fixed_with_overflow.scene.json b/snapshot_tests/text/dimensions_fixed_with_overflow.scene.json
@@ -8,7 +8,7 @@
                     "type": "text",
                     "text": "Example text",
                     "font_size": 120,
-                    "font_family": "Verdana",
+                    "font_family": "Inter",
                     "width": 640,
                     "height": 80
                 }

diff --git a/snapshot_tests/text/red_text_on_blue_background.scene.json b/snapshot_tests/text/red_text_on_blue_background.scene.json
@@ -8,7 +8,7 @@
                     "type": "text",
                     "text": "Example text",
                     "font_size": 50,
-                    "font_family": "Verdana",
+                    "font_family": "Inter",
                     "align": "left",
                     "wrap": "word",
                     "color_rgba": "#FF0000FF",

diff --git a/snapshot_tests/text/root_text.scene.json b/snapshot_tests/text/root_text.scene.json
@@ -4,7 +4,7 @@
             "type": "text",
             "text": "Example text",
             "font_size": 100,
-            "font_family": "Verdana",
+            "font_family": "Inter",
             "width": 1000,
             "height": 200
         }

diff --git a/snapshot_tests/text/wrap_glyph.scene.json b/snapshot_tests/text/wrap_glyph.scene.json
@@ -8,7 +8,7 @@
                     "type": "text",
                     "text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum id eros non eros dictum scelerisque. Sed vehicula magna et metus fringilla, nec placerat felis elementum. Nullam tincidunt dui id purus egestas, et pulvinar est facilisis.",
                     "font_size": 50,
-                    "font_family": "Verdana",
+                    "font_family": "Inter",
                     "align": "left",
                     "wrap": "glyph",
                     "width": 1000,

diff --git a/snapshot_tests/text/wrap_none.scene.json b/snapshot_tests/text/wrap_none.scene.json
@@ -8,7 +8,7 @@
                     "type": "text",
                     "text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum id eros non eros dictum scelerisque. Sed vehicula magna et metus fringilla, nec placerat felis elementum. Nullam tincidunt dui id purus egestas, et pulvinar est facilisis.",
                     "font_size": 50,
-                    "font_family": "Verdana",
+                    "font_family": "Inter",
                     "align": "left",
                     "wrap": "none",
                     "width": 1000,

diff --git a/snapshot_tests/text/wrap_word.scene.json b/snapshot_tests/text/wrap_word.scene.json
@@ -8,7 +8,7 @@
                     "type": "text",
                     "text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum id eros non eros dictum scelerisque. Sed vehicula magna et metus fringilla, nec placerat felis elementum. Nullam tincidunt dui id purus egestas, et pulvinar est facilisis.",
                     "font_size": 50,
-                    "font_family": "Verdana",
+                    "font_family": "Inter",
                     "align": "left",
                     "wrap": "word",
                     "width": 1000,

diff --git a/src/snapshot_tests/test_case.rs b/src/snapshot_tests/test_case.rs
@@ -37,7 +37,7 @@ impl Default for TestCase {
             timestamps: vec![Duration::from_secs(0)],
             scene_updates: Updates::Scenes(vec![]),
             only: false,
-            allowed_error: 20.0,
+            allowed_error: 1.0,
         }
     }
 }

diff --git a/src/snapshot_tests/tests.rs b/src/snapshot_tests/tests.rs
@@ -1188,7 +1188,6 @@ fn text_snapshot_tests() -> Vec<TestCase> {
                 include_str!("../../snapshot_tests/text/wrap_glyph.scene.json"),
                 DEFAULT_RESOLUTION,
             ),
-            allowed_error: 325.7,
             ..Default::default()
         },
         TestCase {
@@ -1205,7 +1204,6 @@ fn text_snapshot_tests() -> Vec<TestCase> {
                 include_str!("../../snapshot_tests/text/wrap_word.scene.json"),
                 DEFAULT_RESOLUTION,
             ),
-            allowed_error: 321.8,
             ..Default::default()
         },
         TestCase {
@@ -1722,7 +1720,6 @@ fn view_snapshot_tests() -> Vec<TestCase> {
         },
         TestCase {
             name: "view/border_radius_box_shadow_overflow_fit",
-            only: true,
             scene_updates: Updates::Scene(
                     include_str!("../../snapshot_tests/view/border_radius_box_shadow_overflow_fit.scene.json"),
                     DEFAULT_RESOLUTION,

diff --git a/src/snapshot_tests/utils.rs b/src/snapshot_tests/utils.rs
@@ -85,7 +85,7 @@ pub(super) fn create_renderer() -> Renderer {
         stream_fallback_timeout: Duration::from_secs(3),
         wgpu_features: WgpuFeatures::default(),
         wgpu_ctx: Some(global_wgpu_ctx(false, Default::default())),
-        load_system_fonts: true,
+        load_system_fonts: false,
     })
     .unwrap();
     renderer