From fc834e8296d3251e4a937ffd53195a25a564e0d5 Mon Sep 17 00:00:00 2001 From: Lukas Woehrl Date: Thu, 5 Jan 2017 20:42:47 +0100 Subject: [PATCH] add testcase where align-self can't override if on second line --- .../tests/Facebook.Yoga/YGAlignItemsTest.cs | 118 ++++++++++++++++++ gentest/fixtures/YGAlignItemsTest.html | 10 ++ .../com/facebook/yoga/YGAlignItemsTest.java | 117 +++++++++++++++++ tests/YGAlignItemsTest.cpp | 116 +++++++++++++++++ 4 files changed, 361 insertions(+) diff --git a/csharp/tests/Facebook.Yoga/YGAlignItemsTest.cs b/csharp/tests/Facebook.Yoga/YGAlignItemsTest.cs index a2213119..1ef9047d 100644 --- a/csharp/tests/Facebook.Yoga/YGAlignItemsTest.cs +++ b/csharp/tests/Facebook.Yoga/YGAlignItemsTest.cs @@ -532,6 +532,124 @@ namespace Facebook.Yoga Assert.AreEqual(10f, root_child1_child3.LayoutHeight); } + [Test] + public void Test_align_baseline_child_multiline_no_override_on_secondline() + { + YogaNode root = new YogaNode(); + root.FlexDirection = YogaFlexDirection.Row; + root.AlignItems = YogaAlign.Baseline; + root.Width = 100; + root.Height = 100; + + YogaNode root_child0 = new YogaNode(); + root_child0.Width = 50; + root_child0.Height = 60; + root.Insert(0, root_child0); + + YogaNode root_child1 = new YogaNode(); + root_child1.FlexDirection = YogaFlexDirection.Row; + root_child1.Wrap = YogaWrap.Wrap; + root_child1.Width = 50; + root_child1.Height = 25; + root.Insert(1, root_child1); + + YogaNode root_child1_child0 = new YogaNode(); + root_child1_child0.Width = 25; + root_child1_child0.Height = 20; + root_child1.Insert(0, root_child1_child0); + + YogaNode root_child1_child1 = new YogaNode(); + root_child1_child1.Width = 25; + root_child1_child1.Height = 10; + root_child1.Insert(1, root_child1_child1); + + YogaNode root_child1_child2 = new YogaNode(); + root_child1_child2.Width = 25; + root_child1_child2.Height = 20; + root_child1.Insert(2, root_child1_child2); + + YogaNode root_child1_child3 = new YogaNode(); + root_child1_child3.AlignSelf = YogaAlign.Baseline; + root_child1_child3.Width = 25; + root_child1_child3.Height = 10; + root_child1.Insert(3, root_child1_child3); + root.StyleDirection = YogaDirection.LTR; + root.CalculateLayout(); + + Assert.AreEqual(0f, root.LayoutX); + Assert.AreEqual(0f, root.LayoutY); + Assert.AreEqual(100f, root.LayoutWidth); + Assert.AreEqual(100f, root.LayoutHeight); + + Assert.AreEqual(0f, root_child0.LayoutX); + Assert.AreEqual(0f, root_child0.LayoutY); + Assert.AreEqual(50f, root_child0.LayoutWidth); + Assert.AreEqual(60f, root_child0.LayoutHeight); + + Assert.AreEqual(50f, root_child1.LayoutX); + Assert.AreEqual(40f, root_child1.LayoutY); + Assert.AreEqual(50f, root_child1.LayoutWidth); + Assert.AreEqual(25f, root_child1.LayoutHeight); + + Assert.AreEqual(0f, root_child1_child0.LayoutX); + Assert.AreEqual(0f, root_child1_child0.LayoutY); + Assert.AreEqual(25f, root_child1_child0.LayoutWidth); + Assert.AreEqual(20f, root_child1_child0.LayoutHeight); + + Assert.AreEqual(25f, root_child1_child1.LayoutX); + Assert.AreEqual(0f, root_child1_child1.LayoutY); + Assert.AreEqual(25f, root_child1_child1.LayoutWidth); + Assert.AreEqual(10f, root_child1_child1.LayoutHeight); + + Assert.AreEqual(0f, root_child1_child2.LayoutX); + Assert.AreEqual(20f, root_child1_child2.LayoutY); + Assert.AreEqual(25f, root_child1_child2.LayoutWidth); + Assert.AreEqual(20f, root_child1_child2.LayoutHeight); + + Assert.AreEqual(25f, root_child1_child3.LayoutX); + Assert.AreEqual(20f, root_child1_child3.LayoutY); + Assert.AreEqual(25f, root_child1_child3.LayoutWidth); + Assert.AreEqual(10f, root_child1_child3.LayoutHeight); + + root.StyleDirection = YogaDirection.RTL; + root.CalculateLayout(); + + Assert.AreEqual(0f, root.LayoutX); + Assert.AreEqual(0f, root.LayoutY); + Assert.AreEqual(100f, root.LayoutWidth); + Assert.AreEqual(100f, root.LayoutHeight); + + Assert.AreEqual(50f, root_child0.LayoutX); + Assert.AreEqual(0f, root_child0.LayoutY); + Assert.AreEqual(50f, root_child0.LayoutWidth); + Assert.AreEqual(60f, root_child0.LayoutHeight); + + Assert.AreEqual(0f, root_child1.LayoutX); + Assert.AreEqual(40f, root_child1.LayoutY); + Assert.AreEqual(50f, root_child1.LayoutWidth); + Assert.AreEqual(25f, root_child1.LayoutHeight); + + Assert.AreEqual(25f, root_child1_child0.LayoutX); + Assert.AreEqual(0f, root_child1_child0.LayoutY); + Assert.AreEqual(25f, root_child1_child0.LayoutWidth); + Assert.AreEqual(20f, root_child1_child0.LayoutHeight); + + Assert.AreEqual(0f, root_child1_child1.LayoutX); + Assert.AreEqual(0f, root_child1_child1.LayoutY); + Assert.AreEqual(25f, root_child1_child1.LayoutWidth); + Assert.AreEqual(10f, root_child1_child1.LayoutHeight); + + Assert.AreEqual(25f, root_child1_child2.LayoutX); + Assert.AreEqual(20f, root_child1_child2.LayoutY); + Assert.AreEqual(25f, root_child1_child2.LayoutWidth); + Assert.AreEqual(20f, root_child1_child2.LayoutHeight); + + Assert.AreEqual(0f, root_child1_child3.LayoutX); + Assert.AreEqual(20f, root_child1_child3.LayoutY); + Assert.AreEqual(25f, root_child1_child3.LayoutWidth); + Assert.AreEqual(10f, root_child1_child3.LayoutHeight); + } + [Test] public void Test_align_baseline_child_top() { diff --git a/gentest/fixtures/YGAlignItemsTest.html b/gentest/fixtures/YGAlignItemsTest.html index 1fc829ba..49aaa9aa 100644 --- a/gentest/fixtures/YGAlignItemsTest.html +++ b/gentest/fixtures/YGAlignItemsTest.html @@ -46,6 +46,16 @@ +
+
+
+
+
+
+
+
+
+
diff --git a/java/tests/com/facebook/yoga/YGAlignItemsTest.java b/java/tests/com/facebook/yoga/YGAlignItemsTest.java index 0a5f5cb4..b4585437 100644 --- a/java/tests/com/facebook/yoga/YGAlignItemsTest.java +++ b/java/tests/com/facebook/yoga/YGAlignItemsTest.java @@ -523,6 +523,123 @@ public class YGAlignItemsTest { assertEquals(10f, root_child1_child3.getLayoutHeight(), 0.0f); } + @Test + public void test_align_baseline_child_multiline_no_override_on_secondline() { + final YogaNode root = new YogaNode(); + root.setFlexDirection(YogaFlexDirection.ROW); + root.setAlignItems(YogaAlign.BASELINE); + root.setWidth(100f); + root.setHeight(100f); + + final YogaNode root_child0 = new YogaNode(); + root_child0.setWidth(50f); + root_child0.setHeight(60f); + root.addChildAt(root_child0, 0); + + final YogaNode root_child1 = new YogaNode(); + root_child1.setFlexDirection(YogaFlexDirection.ROW); + root_child1.setWrap(YogaWrap.WRAP); + root_child1.setWidth(50f); + root_child1.setHeight(25f); + root.addChildAt(root_child1, 1); + + final YogaNode root_child1_child0 = new YogaNode(); + root_child1_child0.setWidth(25f); + root_child1_child0.setHeight(20f); + root_child1.addChildAt(root_child1_child0, 0); + + final YogaNode root_child1_child1 = new YogaNode(); + root_child1_child1.setWidth(25f); + root_child1_child1.setHeight(10f); + root_child1.addChildAt(root_child1_child1, 1); + + final YogaNode root_child1_child2 = new YogaNode(); + root_child1_child2.setWidth(25f); + root_child1_child2.setHeight(20f); + root_child1.addChildAt(root_child1_child2, 2); + + final YogaNode root_child1_child3 = new YogaNode(); + root_child1_child3.setAlignSelf(YogaAlign.BASELINE); + root_child1_child3.setWidth(25f); + root_child1_child3.setHeight(10f); + root_child1.addChildAt(root_child1_child3, 3); + root.setDirection(YogaDirection.LTR); + root.calculateLayout(); + + assertEquals(0f, root.getLayoutX(), 0.0f); + assertEquals(0f, root.getLayoutY(), 0.0f); + assertEquals(100f, root.getLayoutWidth(), 0.0f); + assertEquals(100f, root.getLayoutHeight(), 0.0f); + + assertEquals(0f, root_child0.getLayoutX(), 0.0f); + assertEquals(0f, root_child0.getLayoutY(), 0.0f); + assertEquals(50f, root_child0.getLayoutWidth(), 0.0f); + assertEquals(60f, root_child0.getLayoutHeight(), 0.0f); + + assertEquals(50f, root_child1.getLayoutX(), 0.0f); + assertEquals(40f, root_child1.getLayoutY(), 0.0f); + assertEquals(50f, root_child1.getLayoutWidth(), 0.0f); + assertEquals(25f, root_child1.getLayoutHeight(), 0.0f); + + assertEquals(0f, root_child1_child0.getLayoutX(), 0.0f); + assertEquals(0f, root_child1_child0.getLayoutY(), 0.0f); + assertEquals(25f, root_child1_child0.getLayoutWidth(), 0.0f); + assertEquals(20f, root_child1_child0.getLayoutHeight(), 0.0f); + + assertEquals(25f, root_child1_child1.getLayoutX(), 0.0f); + assertEquals(0f, root_child1_child1.getLayoutY(), 0.0f); + assertEquals(25f, root_child1_child1.getLayoutWidth(), 0.0f); + assertEquals(10f, root_child1_child1.getLayoutHeight(), 0.0f); + + assertEquals(0f, root_child1_child2.getLayoutX(), 0.0f); + assertEquals(20f, root_child1_child2.getLayoutY(), 0.0f); + assertEquals(25f, root_child1_child2.getLayoutWidth(), 0.0f); + assertEquals(20f, root_child1_child2.getLayoutHeight(), 0.0f); + + assertEquals(25f, root_child1_child3.getLayoutX(), 0.0f); + assertEquals(20f, root_child1_child3.getLayoutY(), 0.0f); + assertEquals(25f, root_child1_child3.getLayoutWidth(), 0.0f); + assertEquals(10f, root_child1_child3.getLayoutHeight(), 0.0f); + + root.setDirection(YogaDirection.RTL); + root.calculateLayout(); + + assertEquals(0f, root.getLayoutX(), 0.0f); + assertEquals(0f, root.getLayoutY(), 0.0f); + assertEquals(100f, root.getLayoutWidth(), 0.0f); + assertEquals(100f, root.getLayoutHeight(), 0.0f); + + assertEquals(50f, root_child0.getLayoutX(), 0.0f); + assertEquals(0f, root_child0.getLayoutY(), 0.0f); + assertEquals(50f, root_child0.getLayoutWidth(), 0.0f); + assertEquals(60f, root_child0.getLayoutHeight(), 0.0f); + + assertEquals(0f, root_child1.getLayoutX(), 0.0f); + assertEquals(40f, root_child1.getLayoutY(), 0.0f); + assertEquals(50f, root_child1.getLayoutWidth(), 0.0f); + assertEquals(25f, root_child1.getLayoutHeight(), 0.0f); + + assertEquals(25f, root_child1_child0.getLayoutX(), 0.0f); + assertEquals(0f, root_child1_child0.getLayoutY(), 0.0f); + assertEquals(25f, root_child1_child0.getLayoutWidth(), 0.0f); + assertEquals(20f, root_child1_child0.getLayoutHeight(), 0.0f); + + assertEquals(0f, root_child1_child1.getLayoutX(), 0.0f); + assertEquals(0f, root_child1_child1.getLayoutY(), 0.0f); + assertEquals(25f, root_child1_child1.getLayoutWidth(), 0.0f); + assertEquals(10f, root_child1_child1.getLayoutHeight(), 0.0f); + + assertEquals(25f, root_child1_child2.getLayoutX(), 0.0f); + assertEquals(20f, root_child1_child2.getLayoutY(), 0.0f); + assertEquals(25f, root_child1_child2.getLayoutWidth(), 0.0f); + assertEquals(20f, root_child1_child2.getLayoutHeight(), 0.0f); + + assertEquals(0f, root_child1_child3.getLayoutX(), 0.0f); + assertEquals(20f, root_child1_child3.getLayoutY(), 0.0f); + assertEquals(25f, root_child1_child3.getLayoutWidth(), 0.0f); + assertEquals(10f, root_child1_child3.getLayoutHeight(), 0.0f); + } + @Test public void test_align_baseline_child_top() { final YogaNode root = new YogaNode(); diff --git a/tests/YGAlignItemsTest.cpp b/tests/YGAlignItemsTest.cpp index 092bb26f..dbbd1e9b 100644 --- a/tests/YGAlignItemsTest.cpp +++ b/tests/YGAlignItemsTest.cpp @@ -511,6 +511,122 @@ TEST(YogaTest, align_baseline_child_multiline_override) { YGNodeFreeRecursive(root); } +TEST(YogaTest, align_baseline_child_multiline_no_override_on_secondline) { + const YGNodeRef root = YGNodeNew(); + YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow); + YGNodeStyleSetAlignItems(root, YGAlignBaseline); + YGNodeStyleSetWidth(root, 100); + YGNodeStyleSetHeight(root, 100); + + const YGNodeRef root_child0 = YGNodeNew(); + YGNodeStyleSetWidth(root_child0, 50); + YGNodeStyleSetHeight(root_child0, 60); + YGNodeInsertChild(root, root_child0, 0); + + const YGNodeRef root_child1 = YGNodeNew(); + YGNodeStyleSetFlexDirection(root_child1, YGFlexDirectionRow); + YGNodeStyleSetFlexWrap(root_child1, YGWrapWrap); + YGNodeStyleSetWidth(root_child1, 50); + YGNodeStyleSetHeight(root_child1, 25); + YGNodeInsertChild(root, root_child1, 1); + + const YGNodeRef root_child1_child0 = YGNodeNew(); + YGNodeStyleSetWidth(root_child1_child0, 25); + YGNodeStyleSetHeight(root_child1_child0, 20); + YGNodeInsertChild(root_child1, root_child1_child0, 0); + + const YGNodeRef root_child1_child1 = YGNodeNew(); + YGNodeStyleSetWidth(root_child1_child1, 25); + YGNodeStyleSetHeight(root_child1_child1, 10); + YGNodeInsertChild(root_child1, root_child1_child1, 1); + + const YGNodeRef root_child1_child2 = YGNodeNew(); + YGNodeStyleSetWidth(root_child1_child2, 25); + YGNodeStyleSetHeight(root_child1_child2, 20); + YGNodeInsertChild(root_child1, root_child1_child2, 2); + + const YGNodeRef root_child1_child3 = YGNodeNew(); + YGNodeStyleSetAlignSelf(root_child1_child3, YGAlignBaseline); + YGNodeStyleSetWidth(root_child1_child3, 25); + YGNodeStyleSetHeight(root_child1_child3, 10); + YGNodeInsertChild(root_child1, root_child1_child3, 3); + YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR); + + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root)); + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root)); + ASSERT_FLOAT_EQ(100, YGNodeLayoutGetWidth(root)); + ASSERT_FLOAT_EQ(100, YGNodeLayoutGetHeight(root)); + + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child0)); + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0)); + ASSERT_FLOAT_EQ(50, YGNodeLayoutGetWidth(root_child0)); + ASSERT_FLOAT_EQ(60, YGNodeLayoutGetHeight(root_child0)); + + ASSERT_FLOAT_EQ(50, YGNodeLayoutGetLeft(root_child1)); + ASSERT_FLOAT_EQ(40, YGNodeLayoutGetTop(root_child1)); + ASSERT_FLOAT_EQ(50, YGNodeLayoutGetWidth(root_child1)); + ASSERT_FLOAT_EQ(25, YGNodeLayoutGetHeight(root_child1)); + + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child1_child0)); + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1_child0)); + ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child0)); + ASSERT_FLOAT_EQ(20, YGNodeLayoutGetHeight(root_child1_child0)); + + ASSERT_FLOAT_EQ(25, YGNodeLayoutGetLeft(root_child1_child1)); + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1_child1)); + ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child1)); + ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child1_child1)); + + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child1_child2)); + ASSERT_FLOAT_EQ(20, YGNodeLayoutGetTop(root_child1_child2)); + ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child2)); + ASSERT_FLOAT_EQ(20, YGNodeLayoutGetHeight(root_child1_child2)); + + ASSERT_FLOAT_EQ(25, YGNodeLayoutGetLeft(root_child1_child3)); + ASSERT_FLOAT_EQ(20, YGNodeLayoutGetTop(root_child1_child3)); + ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child3)); + ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child1_child3)); + + YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionRTL); + + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root)); + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root)); + ASSERT_FLOAT_EQ(100, YGNodeLayoutGetWidth(root)); + ASSERT_FLOAT_EQ(100, YGNodeLayoutGetHeight(root)); + + ASSERT_FLOAT_EQ(50, YGNodeLayoutGetLeft(root_child0)); + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0)); + ASSERT_FLOAT_EQ(50, YGNodeLayoutGetWidth(root_child0)); + ASSERT_FLOAT_EQ(60, YGNodeLayoutGetHeight(root_child0)); + + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child1)); + ASSERT_FLOAT_EQ(40, YGNodeLayoutGetTop(root_child1)); + ASSERT_FLOAT_EQ(50, YGNodeLayoutGetWidth(root_child1)); + ASSERT_FLOAT_EQ(25, YGNodeLayoutGetHeight(root_child1)); + + ASSERT_FLOAT_EQ(25, YGNodeLayoutGetLeft(root_child1_child0)); + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1_child0)); + ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child0)); + ASSERT_FLOAT_EQ(20, YGNodeLayoutGetHeight(root_child1_child0)); + + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child1_child1)); + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1_child1)); + ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child1)); + ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child1_child1)); + + ASSERT_FLOAT_EQ(25, YGNodeLayoutGetLeft(root_child1_child2)); + ASSERT_FLOAT_EQ(20, YGNodeLayoutGetTop(root_child1_child2)); + ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child2)); + ASSERT_FLOAT_EQ(20, YGNodeLayoutGetHeight(root_child1_child2)); + + ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child1_child3)); + ASSERT_FLOAT_EQ(20, YGNodeLayoutGetTop(root_child1_child3)); + ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child3)); + ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child1_child3)); + + YGNodeFreeRecursive(root); +} + TEST(YogaTest, align_baseline_child_top) { const YGNodeRef root = YGNodeNew(); YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow);