gioser

tawasuyu/taffy

A high performance rust-powered UI layout library

Rust 501HTML 254C 19JavaScript 81414 Definiciones

Update percentage tests to use different width/android on container

59cd7a4b3ab55aed5f1eb7cdf2dd4a739875345d · por Emil Sjölander · (hace 7 años) · padre 633f14f3d · ver el árbol en este commit

Delta semántico · 10

tests/generated.rs

11 archivos · +53 −53

diff --git a/test_fixtures/percentage_flex_basis_cross.html b/test_fixtures/percentage_flex_basis_cross.html
index b403adbca..0038a1b67 100644
--- a/test_fixtures/percentage_flex_basis_cross.html
+++ b/test_fixtures/percentage_flex_basis_cross.html
@@ -9,7 +9,7 @@
 <head/>
 <body>
 
-<div id="test-root" style="width: 200px; height: 200px; flex-direction: column;">
+<div id="test-root" style="width: 200px; height: 400px; flex-direction: column;">
   <div style="flex-grow: 1; flex-basis: 50%;"></div>
   <div style="flex-grow: 1; flex-basis: 25%;"></div>
 </div>
diff --git a/test_fixtures/percentage_flex_basis_cross_max_height.html b/test_fixtures/percentage_flex_basis_cross_max_height.html
index 2a692db28..6ecd627aa 100644
--- a/test_fixtures/percentage_flex_basis_cross_max_height.html
+++ b/test_fixtures/percentage_flex_basis_cross_max_height.html
@@ -9,7 +9,7 @@
 <head/>
 <body>
 
-<div id="test-root" style="width: 200px; height: 200px; flex-direction: column;">
+<div id="test-root" style="width: 200px; height: 400px; flex-direction: column;">
   <div style="flex-grow: 1; flex-basis: 10%; max-height: 60%;"></div>
   <div style="flex-grow: 4; flex-basis: 10%; max-height: 20%;"></div>
 </div>
diff --git a/test_fixtures/percentage_flex_basis_cross_max_width.html b/test_fixtures/percentage_flex_basis_cross_max_width.html
index 323e0d2d2..b1d62851f 100644
--- a/test_fixtures/percentage_flex_basis_cross_max_width.html
+++ b/test_fixtures/percentage_flex_basis_cross_max_width.html
@@ -9,7 +9,7 @@
 <head/>
 <body>
 
-<div id="test-root" style="width: 200px; height: 200px; flex-direction: column;">
+<div id="test-root" style="width: 200px; height: 400px; flex-direction: column;">
   <div style="flex-grow: 1; flex-basis: 10%; max-width: 60%;"></div>
   <div style="flex-grow: 4; flex-basis: 15%; max-width: 20%;"></div>
 </div>
diff --git a/test_fixtures/percentage_flex_basis_cross_min_height.html b/test_fixtures/percentage_flex_basis_cross_min_height.html
index 8028cfeb1..ddaa50e1c 100644
--- a/test_fixtures/percentage_flex_basis_cross_min_height.html
+++ b/test_fixtures/percentage_flex_basis_cross_min_height.html
@@ -9,7 +9,7 @@
 <head/>
 <body>
 
-<div id="test-root" style="width: 200px; height: 200px; flex-direction: column;">
+<div id="test-root" style="width: 200px; height: 400px; flex-direction: column;">
   <div style="flex-grow: 1; min-height: 60%;"></div>
   <div style="flex-grow: 2; min-height: 10%;"></div>
 </div>
diff --git a/test_fixtures/percentage_flex_basis_cross_min_width.html b/test_fixtures/percentage_flex_basis_cross_min_width.html
index 1c9d8a5e6..717a8cb63 100644
--- a/test_fixtures/percentage_flex_basis_cross_min_width.html
+++ b/test_fixtures/percentage_flex_basis_cross_min_width.html
@@ -9,7 +9,7 @@
 <head/>
 <body>
 
-<div id="test-root" style="width: 200px; height: 200px; flex-direction: column;">
+<div id="test-root" style="width: 200px; height: 400px; flex-direction: column;">
   <div style="flex-grow: 1; flex-basis: 10%; min-width: 60%;"></div>
   <div style="flex-grow: 4; flex-basis: 15%; min-width: 20%;"></div>
 </div>
diff --git a/test_fixtures/percentage_flex_basis_main_max_height.html b/test_fixtures/percentage_flex_basis_main_max_height.html
index 278d59717..44132d562 100644
--- a/test_fixtures/percentage_flex_basis_main_max_height.html
+++ b/test_fixtures/percentage_flex_basis_main_max_height.html
@@ -9,7 +9,7 @@
 <head/>
 <body>
 
-<div id="test-root" style="width: 200px; height: 200px; flex-direction: row;">
+<div id="test-root" style="width: 200px; height: 400px; flex-direction: row;">
   <div style="flex-grow: 1; flex-basis: 10%; max-height: 60%;"></div>
   <div style="flex-grow: 4; flex-basis: 10%; max-height: 20%;"></div>
 </div>
diff --git a/test_fixtures/percentage_flex_basis_main_max_width.html b/test_fixtures/percentage_flex_basis_main_max_width.html
index 98af71dd2..16f0cf815 100644
--- a/test_fixtures/percentage_flex_basis_main_max_width.html
+++ b/test_fixtures/percentage_flex_basis_main_max_width.html
@@ -9,7 +9,7 @@
 <head/>
 <body>
 
-<div id="test-root" style="width: 200px; height: 200px; flex-direction: row;">
+<div id="test-root" style="width: 200px; height: 400px; flex-direction: row;">
   <div style="flex-grow: 1; flex-basis: 15%; max-width: 60%;"></div>
   <div style="flex-grow: 4; flex-basis: 10%; max-width: 20%;"></div>
 </div>
diff --git a/test_fixtures/percentage_flex_basis_main_min_width.html b/test_fixtures/percentage_flex_basis_main_min_width.html
index 7f0b1b209..43e4346ca 100644
--- a/test_fixtures/percentage_flex_basis_main_min_width.html
+++ b/test_fixtures/percentage_flex_basis_main_min_width.html
@@ -9,7 +9,7 @@
 <head/>
 <body>
 
-<div id="test-root" style="width: 200px; height: 200px; flex-direction: row;">
+<div id="test-root" style="width: 200px; height: 400px; flex-direction: row;">
   <div style="flex-grow: 1; flex-basis: 15%; min-width: 60%;"></div>
   <div style="flex-grow: 4; flex-basis: 10%; min-width: 20%;"></div>
 </div>
diff --git a/test_fixtures/percentage_size_based_on_parent_inner_size.html b/test_fixtures/percentage_size_based_on_parent_inner_size.html
index d501c8ac6..b9f47205b 100644
--- a/test_fixtures/percentage_size_based_on_parent_inner_size.html
+++ b/test_fixtures/percentage_size_based_on_parent_inner_size.html
@@ -9,7 +9,7 @@
 <head/>
 <body>
 
-<div id="test-root" style="width: 200px; height: 200px; padding: 20px; flex-direction: column;">
+<div id="test-root" style="width: 200px; height: 400px; padding: 20px; flex-direction: column;">
   <div style="width: 50%; height: 50%;"></div>
 </div>
 
diff --git a/test_fixtures/percentage_width_height.html b/test_fixtures/percentage_width_height.html
index 74001a931..1b1c7506b 100644
--- a/test_fixtures/percentage_width_height.html
+++ b/test_fixtures/percentage_width_height.html
@@ -9,7 +9,7 @@
 <head/>
 <body>
 
-<div id="test-root" style="width: 200px; height: 200px; flex-direction: row;">
+<div id="test-root" style="width: 200px; height: 400px; flex-direction: row;">
   <div style="width: 30%; height: 30%;"></div>
 </div>
 
diff --git a/tests/generated.rs b/tests/generated.rs
index 6d3cc77f1..05cb78909 100644
--- a/tests/generated.rs
+++ b/tests/generated.rs
@@ -3072,7 +3072,7 @@ mod generated {
             &stretch::style::Node {
                 size: stretch::geometry::Size {
                     width: stretch::style::Dimension::Points(200.0000),
-                    height: stretch::style::Dimension::Points(200.0000),
+                    height: stretch::style::Dimension::Points(400.0000),
                     ..Default::default()
                 },
                 children: vec![
@@ -3101,17 +3101,17 @@ mod generated {
         );
 
         assert_eq!(layout.size.width, 200.0000);
-        assert_eq!(layout.size.height, 200.0000);
+        assert_eq!(layout.size.height, 400.0000);
         assert_eq!(layout.location.x, 0.0000);
         assert_eq!(layout.location.y, 0.0000);
 
         assert_eq!(layout.children[0].size.width, 120.0000);
-        assert_eq!(layout.children[0].size.height, 200.0000);
+        assert_eq!(layout.children[0].size.height, 400.0000);
         assert_eq!(layout.children[0].location.x, 0.0000);
         assert_eq!(layout.children[0].location.y, 0.0000);
 
         assert_eq!(layout.children[1].size.width, 40.0000);
-        assert_eq!(layout.children[1].size.height, 200.0000);
+        assert_eq!(layout.children[1].size.height, 400.0000);
         assert_eq!(layout.children[1].location.x, 120.0000);
         assert_eq!(layout.children[1].location.y, 0.0000);
     }
@@ -3428,7 +3428,7 @@ mod generated {
                 flex_direction: stretch::style::FlexDirection::Column,
                 size: stretch::geometry::Size {
                     width: stretch::style::Dimension::Points(200.0000),
-                    height: stretch::style::Dimension::Points(200.0000),
+                    height: stretch::style::Dimension::Points(400.0000),
                     ..Default::default()
                 },
                 children: vec![
@@ -3449,19 +3449,19 @@ mod generated {
         );
 
         assert_eq!(layout.size.width, 200.0000);
-        assert_eq!(layout.size.height, 200.0000);
+        assert_eq!(layout.size.height, 400.0000);
         assert_eq!(layout.location.x, 0.0000);
         assert_eq!(layout.location.y, 0.0000);
 
         assert_eq!(layout.children[0].size.width, 200.0000);
-        assert_eq!(layout.children[0].size.height, 125.0000);
+        assert_eq!(layout.children[0].size.height, 250.0000);
         assert_eq!(layout.children[0].location.x, 0.0000);
         assert_eq!(layout.children[0].location.y, 0.0000);
 
         assert_eq!(layout.children[1].size.width, 200.0000);
-        assert_eq!(layout.children[1].size.height, 75.0000);
+        assert_eq!(layout.children[1].size.height, 150.0000);
         assert_eq!(layout.children[1].location.x, 0.0000);
-        assert_eq!(layout.children[1].location.y, 125.0000);
+        assert_eq!(layout.children[1].location.y, 250.0000);
     }
 
     #[test]
@@ -3958,7 +3958,7 @@ mod generated {
                 flex_direction: stretch::style::FlexDirection::Column,
                 size: stretch::geometry::Size {
                     width: stretch::style::Dimension::Points(200.0000),
-                    height: stretch::style::Dimension::Points(200.0000),
+                    height: stretch::style::Dimension::Points(400.0000),
                     ..Default::default()
                 },
                 children: vec![
@@ -3987,19 +3987,19 @@ mod generated {
         );
 
         assert_eq!(layout.size.width, 200.0000);
-        assert_eq!(layout.size.height, 200.0000);
+        assert_eq!(layout.size.height, 400.0000);
         assert_eq!(layout.location.x, 0.0000);
         assert_eq!(layout.location.y, 0.0000);
 
         assert_eq!(layout.children[0].size.width, 120.0000);
-        assert_eq!(layout.children[0].size.height, 50.0000);
+        assert_eq!(layout.children[0].size.height, 100.0000);
         assert_eq!(layout.children[0].location.x, 0.0000);
         assert_eq!(layout.children[0].location.y, 0.0000);
 
         assert_eq!(layout.children[1].size.width, 40.0000);
-        assert_eq!(layout.children[1].size.height, 150.0000);
+        assert_eq!(layout.children[1].size.height, 300.0000);
         assert_eq!(layout.children[1].location.x, 0.0000);
-        assert_eq!(layout.children[1].location.y, 50.0000);
+        assert_eq!(layout.children[1].location.y, 100.0000);
     }
 
     #[test]
@@ -4499,7 +4499,7 @@ mod generated {
                 flex_direction: stretch::style::FlexDirection::Column,
                 size: stretch::geometry::Size {
                     width: stretch::style::Dimension::Points(200.0000),
-                    height: stretch::style::Dimension::Points(200.0000),
+                    height: stretch::style::Dimension::Points(400.0000),
                     ..Default::default()
                 },
                 children: vec![
@@ -4526,19 +4526,19 @@ mod generated {
         );
 
         assert_eq!(layout.size.width, 200.0000);
-        assert_eq!(layout.size.height, 200.0000);
+        assert_eq!(layout.size.height, 400.0000);
         assert_eq!(layout.location.x, 0.0000);
         assert_eq!(layout.location.y, 0.0000);
 
         assert_eq!(layout.children[0].size.width, 200.0000);
-        assert_eq!(layout.children[0].size.height, 140.0000);
+        assert_eq!(layout.children[0].size.height, 280.0000);
         assert_eq!(layout.children[0].location.x, 0.0000);
         assert_eq!(layout.children[0].location.y, 0.0000);
 
         assert_eq!(layout.children[1].size.width, 200.0000);
-        assert_eq!(layout.children[1].size.height, 60.0000);
+        assert_eq!(layout.children[1].size.height, 120.0000);
         assert_eq!(layout.children[1].location.x, 0.0000);
-        assert_eq!(layout.children[1].location.y, 140.0000);
+        assert_eq!(layout.children[1].location.y, 280.0000);
     }
 
     #[test]
@@ -4761,7 +4761,7 @@ mod generated {
             &stretch::style::Node {
                 size: stretch::geometry::Size {
                     width: stretch::style::Dimension::Points(200.0000),
-                    height: stretch::style::Dimension::Points(200.0000),
+                    height: stretch::style::Dimension::Points(400.0000),
                     ..Default::default()
                 },
                 children: vec![stretch::style::Node {
@@ -4778,12 +4778,12 @@ mod generated {
         );
 
         assert_eq!(layout.size.width, 200.0000);
-        assert_eq!(layout.size.height, 200.0000);
+        assert_eq!(layout.size.height, 400.0000);
         assert_eq!(layout.location.x, 0.0000);
         assert_eq!(layout.location.y, 0.0000);
 
         assert_eq!(layout.children[0].size.width, 60.0000);
-        assert_eq!(layout.children[0].size.height, 60.0000);
+        assert_eq!(layout.children[0].size.height, 120.0000);
         assert_eq!(layout.children[0].location.x, 0.0000);
         assert_eq!(layout.children[0].location.y, 0.0000);
     }
@@ -6044,7 +6044,7 @@ mod generated {
                 flex_direction: stretch::style::FlexDirection::Column,
                 size: stretch::geometry::Size {
                     width: stretch::style::Dimension::Points(200.0000),
-                    height: stretch::style::Dimension::Points(200.0000),
+                    height: stretch::style::Dimension::Points(400.0000),
                     ..Default::default()
                 },
                 padding: stretch::geometry::Rect {
@@ -6068,12 +6068,12 @@ mod generated {
         );
 
         assert_eq!(layout.size.width, 200.0000);
-        assert_eq!(layout.size.height, 200.0000);
+        assert_eq!(layout.size.height, 400.0000);
         assert_eq!(layout.location.x, 0.0000);
         assert_eq!(layout.location.y, 0.0000);
 
         assert_eq!(layout.children[0].size.width, 80.0000);
-        assert_eq!(layout.children[0].size.height, 80.0000);
+        assert_eq!(layout.children[0].size.height, 180.0000);
         assert_eq!(layout.children[0].location.x, 20.0000);
         assert_eq!(layout.children[0].location.y, 20.0000);
     }
@@ -8472,7 +8472,7 @@ mod generated {
             &stretch::style::Node {
                 size: stretch::geometry::Size {
                     width: stretch::style::Dimension::Points(200.0000),
-                    height: stretch::style::Dimension::Points(200.0000),
+                    height: stretch::style::Dimension::Points(400.0000),
                     ..Default::default()
                 },
                 children: vec![
@@ -8501,17 +8501,17 @@ mod generated {
         );
 
         assert_eq!(layout.size.width, 200.0000);
-        assert_eq!(layout.size.height, 200.0000);
+        assert_eq!(layout.size.height, 400.0000);
         assert_eq!(layout.location.x, 0.0000);
         assert_eq!(layout.location.y, 0.0000);
 
         assert_eq!(layout.children[0].size.width, 52.0000);
-        assert_eq!(layout.children[0].size.height, 120.0000);
+        assert_eq!(layout.children[0].size.height, 240.0000);
         assert_eq!(layout.children[0].location.x, 0.0000);
         assert_eq!(layout.children[0].location.y, 0.0000);
 
         assert_eq!(layout.children[1].size.width, 148.0000);
-        assert_eq!(layout.children[1].size.height, 40.0000);
+        assert_eq!(layout.children[1].size.height, 80.0000);
         assert_eq!(layout.children[1].location.x, 52.0000);
         assert_eq!(layout.children[1].location.y, 0.0000);
     }
@@ -9270,7 +9270,7 @@ mod generated {
             &stretch::style::Node {
                 size: stretch::geometry::Size {
                     width: stretch::style::Dimension::Points(200.0000),
-                    height: stretch::style::Dimension::Points(200.0000),
+                    height: stretch::style::Dimension::Points(400.0000),
                     ..Default::default()
                 },
                 children: vec![
@@ -9299,17 +9299,17 @@ mod generated {
         );
 
         assert_eq!(layout.size.width, 200.0000);
-        assert_eq!(layout.size.height, 200.0000);
+        assert_eq!(layout.size.height, 400.0000);
         assert_eq!(layout.location.x, 0.0000);
         assert_eq!(layout.location.y, 0.0000);
 
         assert_eq!(layout.children[0].size.width, 120.0000);
-        assert_eq!(layout.children[0].size.height, 200.0000);
+        assert_eq!(layout.children[0].size.height, 400.0000);
         assert_eq!(layout.children[0].location.x, 0.0000);
         assert_eq!(layout.children[0].location.y, 0.0000);
 
         assert_eq!(layout.children[1].size.width, 80.0000);
-        assert_eq!(layout.children[1].size.height, 200.0000);
+        assert_eq!(layout.children[1].size.height, 400.0000);
         assert_eq!(layout.children[1].location.x, 120.0000);
         assert_eq!(layout.children[1].location.y, 0.0000);
     }
@@ -10099,7 +10099,7 @@ mod generated {
                 flex_direction: stretch::style::FlexDirection::Column,
                 size: stretch::geometry::Size {
                     width: stretch::style::Dimension::Points(200.0000),
-                    height: stretch::style::Dimension::Points(200.0000),
+                    height: stretch::style::Dimension::Points(400.0000),
                     ..Default::default()
                 },
                 children: vec![
@@ -10128,19 +10128,19 @@ mod generated {
         );
 
         assert_eq!(layout.size.width, 200.0000);
-        assert_eq!(layout.size.height, 200.0000);
+        assert_eq!(layout.size.height, 400.0000);
         assert_eq!(layout.location.x, 0.0000);
         assert_eq!(layout.location.y, 0.0000);
 
         assert_eq!(layout.children[0].size.width, 200.0000);
-        assert_eq!(layout.children[0].size.height, 50.0000);
+        assert_eq!(layout.children[0].size.height, 100.0000);
         assert_eq!(layout.children[0].location.x, 0.0000);
         assert_eq!(layout.children[0].location.y, 0.0000);
 
         assert_eq!(layout.children[1].size.width, 200.0000);
-        assert_eq!(layout.children[1].size.height, 150.0000);
+        assert_eq!(layout.children[1].size.height, 300.0000);
         assert_eq!(layout.children[1].location.x, 0.0000);
-        assert_eq!(layout.children[1].location.y, 50.0000);
+        assert_eq!(layout.children[1].location.y, 100.0000);
     }
 
     #[test]
@@ -10288,7 +10288,7 @@ mod generated {
                 flex_direction: stretch::style::FlexDirection::Column,
                 size: stretch::geometry::Size {
                     width: stretch::style::Dimension::Points(200.0000),
-                    height: stretch::style::Dimension::Points(200.0000),
+                    height: stretch::style::Dimension::Points(400.0000),
                     ..Default::default()
                 },
                 children: vec![
@@ -10317,19 +10317,19 @@ mod generated {
         );
 
         assert_eq!(layout.size.width, 200.0000);
-        assert_eq!(layout.size.height, 200.0000);
+        assert_eq!(layout.size.height, 400.0000);
         assert_eq!(layout.location.x, 0.0000);
         assert_eq!(layout.location.y, 0.0000);
 
         assert_eq!(layout.children[0].size.width, 200.0000);
-        assert_eq!(layout.children[0].size.height, 120.0000);
+        assert_eq!(layout.children[0].size.height, 240.0000);
         assert_eq!(layout.children[0].location.x, 0.0000);
         assert_eq!(layout.children[0].location.y, 0.0000);
 
         assert_eq!(layout.children[1].size.width, 200.0000);
-        assert_eq!(layout.children[1].size.height, 40.0000);
+        assert_eq!(layout.children[1].size.height, 80.0000);
         assert_eq!(layout.children[1].location.x, 0.0000);
-        assert_eq!(layout.children[1].location.y, 120.0000);
+        assert_eq!(layout.children[1].location.y, 240.0000);
     }
 
     #[test]