DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

re-generate tests. Something was missed when rebasing

Browse Source 
Summary: Some of the tests were not generated correctly. most likely due to a rebase.

Reviewed By: astreet

Differential Revision: D4637539

fbshipit-source-id: 196478d7e5197519af9ab05e5134e6fb7d22b992
This commit is contained in:
Emil Sjolander
2017-03-03 10:15:49 -08:00
committed by Facebook Github Bot
parent 29fd447f0c
commit 0fde1424f0
4 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
csharp/tests/Facebook.Yoga/YGMarginTest.cs
View File

@@ -952,20 +952,22 @@ namespace Facebook.Yoga
[Test] [Test]
public void Test_margin_auto_start_and_end_column() public void Test_margin_auto_start_and_end_column()
{ {
YogaNode root = new YogaNode(); YogaConfig config = new YogaConfig();
YogaNode root = new YogaNode(config);
root.FlexDirection = YogaFlexDirection.Row; root.FlexDirection = YogaFlexDirection.Row;
root.AlignItems = YogaAlign.Center; root.AlignItems = YogaAlign.Center;
root.Width = 200; root.Width = 200;
root.Height = 200; root.Height = 200;
YogaNode root_child0 = new YogaNode(); YogaNode root_child0 = new YogaNode(config);
root_child0.MarginStart = YogaValue.Auto(); root_child0.MarginStart = YogaValue.Auto();
root_child0.MarginEnd = YogaValue.Auto(); root_child0.MarginEnd = YogaValue.Auto();
root_child0.Width = 50; root_child0.Width = 50;
root_child0.Height = 50; root_child0.Height = 50;
root.Insert(0, root_child0); root.Insert(0, root_child0);
YogaNode root_child1 = new YogaNode(); YogaNode root_child1 = new YogaNode(config);
root_child1.Width = 50; root_child1.Width = 50;
root_child1.Height = 50; root_child1.Height = 50;
root.Insert(1, root_child1); root.Insert(1, root_child1);
@@ -1009,18 +1011,20 @@ namespace Facebook.Yoga
[Test] [Test]
public void Test_margin_auto_start_and_end() public void Test_margin_auto_start_and_end()
{ {
YogaNode root = new YogaNode(); YogaConfig config = new YogaConfig();
YogaNode root = new YogaNode(config);
root.Width = 200; root.Width = 200;
root.Height = 200; root.Height = 200;
YogaNode root_child0 = new YogaNode(); YogaNode root_child0 = new YogaNode(config);
root_child0.MarginStart = YogaValue.Auto(); root_child0.MarginStart = YogaValue.Auto();
root_child0.MarginEnd = YogaValue.Auto(); root_child0.MarginEnd = YogaValue.Auto();
root_child0.Width = 50; root_child0.Width = 50;
root_child0.Height = 50; root_child0.Height = 50;
root.Insert(0, root_child0); root.Insert(0, root_child0);
YogaNode root_child1 = new YogaNode(); YogaNode root_child1 = new YogaNode(config);
root_child1.Width = 50; root_child1.Width = 50;
root_child1.Height = 50; root_child1.Height = 50;
root.Insert(1, root_child1); root.Insert(1, root_child1);

16
java/tests/com/facebook/yoga/YGMarginTest.java
View File

@@ -932,20 +932,22 @@ public class YGMarginTest {
@Test @Test
public void test_margin_auto_start_and_end_column() { public void test_margin_auto_start_and_end_column() {
final YogaNode root = new YogaNode(); YogaConfig config = new YogaConfig();
final YogaNode root = new YogaNode(config);
root.setFlexDirection(YogaFlexDirection.ROW); root.setFlexDirection(YogaFlexDirection.ROW);
root.setAlignItems(YogaAlign.CENTER); root.setAlignItems(YogaAlign.CENTER);
root.setWidth(200f); root.setWidth(200f);
root.setHeight(200f); root.setHeight(200f);
final YogaNode root_child0 = new YogaNode(); final YogaNode root_child0 = new YogaNode(config);
root_child0.setMarginAuto(YogaEdge.START); root_child0.setMarginAuto(YogaEdge.START);
root_child0.setMarginAuto(YogaEdge.END); root_child0.setMarginAuto(YogaEdge.END);
root_child0.setWidth(50f); root_child0.setWidth(50f);
root_child0.setHeight(50f); root_child0.setHeight(50f);
root.addChildAt(root_child0, 0); root.addChildAt(root_child0, 0);
final YogaNode root_child1 = new YogaNode(); final YogaNode root_child1 = new YogaNode(config);
root_child1.setWidth(50f); root_child1.setWidth(50f);
root_child1.setHeight(50f); root_child1.setHeight(50f);
root.addChildAt(root_child1, 1); root.addChildAt(root_child1, 1);
@@ -988,18 +990,20 @@ public class YGMarginTest {
@Test @Test
public void test_margin_auto_start_and_end() { public void test_margin_auto_start_and_end() {
final YogaNode root = new YogaNode(); YogaConfig config = new YogaConfig();
final YogaNode root = new YogaNode(config);
root.setWidth(200f); root.setWidth(200f);
root.setHeight(200f); root.setHeight(200f);
final YogaNode root_child0 = new YogaNode(); final YogaNode root_child0 = new YogaNode(config);
root_child0.setMarginAuto(YogaEdge.START); root_child0.setMarginAuto(YogaEdge.START);
root_child0.setMarginAuto(YogaEdge.END); root_child0.setMarginAuto(YogaEdge.END);
root_child0.setWidth(50f); root_child0.setWidth(50f);
root_child0.setHeight(50f); root_child0.setHeight(50f);
root.addChildAt(root_child0, 0); root.addChildAt(root_child0, 0);
final YogaNode root_child1 = new YogaNode(); final YogaNode root_child1 = new YogaNode(config);
root_child1.setWidth(50f); root_child1.setWidth(50f);
root_child1.setHeight(50f); root_child1.setHeight(50f);
root.addChildAt(root_child1, 1); root.addChildAt(root_child1, 1);

12
javascript/tests/Facebook.Yoga/YGMarginTest.js
View File

@@ -927,20 +927,20 @@ it("margin_auto_left_and_right", function () {
}); });
it("margin_auto_start_and_end_column", function () { it("margin_auto_start_and_end_column", function () {
try { try {
var root = Yoga.Node.create(); var root = Yoga.Node.create(config);
root.setFlexDirection(Yoga.FLEX_DIRECTION_ROW); root.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
root.setAlignItems(Yoga.ALIGN_CENTER); root.setAlignItems(Yoga.ALIGN_CENTER);
root.setWidth(200); root.setWidth(200);
root.setHeight(200); root.setHeight(200);
var root_child0 = Yoga.Node.create(); var root_child0 = Yoga.Node.create(config);
root_child0.setMargin(Yoga.EDGE_START, "auto"); root_child0.setMargin(Yoga.EDGE_START, "auto");
root_child0.setMargin(Yoga.EDGE_END, "auto"); root_child0.setMargin(Yoga.EDGE_END, "auto");
root_child0.setWidth(50); root_child0.setWidth(50);
root_child0.setHeight(50); root_child0.setHeight(50);
root.insertChild(root_child0, 0); root.insertChild(root_child0, 0);
var root_child1 = Yoga.Node.create(); var root_child1 = Yoga.Node.create(config);
root_child1.setWidth(50); root_child1.setWidth(50);
root_child1.setHeight(50); root_child1.setHeight(50);
root.insertChild(root_child1, 1); root.insertChild(root_child1, 1);
@@ -985,18 +985,18 @@ it("margin_auto_start_and_end_column", function () {
}); });
it("margin_auto_start_and_end", function () { it("margin_auto_start_and_end", function () {
try { try {
var root = Yoga.Node.create(); var root = Yoga.Node.create(config);
root.setWidth(200); root.setWidth(200);
root.setHeight(200); root.setHeight(200);
var root_child0 = Yoga.Node.create(); var root_child0 = Yoga.Node.create(config);
root_child0.setMargin(Yoga.EDGE_START, "auto"); root_child0.setMargin(Yoga.EDGE_START, "auto");
root_child0.setMargin(Yoga.EDGE_END, "auto"); root_child0.setMargin(Yoga.EDGE_END, "auto");
root_child0.setWidth(50); root_child0.setWidth(50);
root_child0.setHeight(50); root_child0.setHeight(50);
root.insertChild(root_child0, 0); root.insertChild(root_child0, 0);
var root_child1 = Yoga.Node.create(); var root_child1 = Yoga.Node.create(config);
root_child1.setWidth(50); root_child1.setWidth(50);
root_child1.setHeight(50); root_child1.setHeight(50);
root.insertChild(root_child1, 1); root.insertChild(root_child1, 1);

20
tests/YGMarginTest.cpp
View File

@@ -945,20 +945,22 @@ TEST(YogaTest, margin_auto_left_and_right) {
} }
TEST(YogaTest, margin_auto_start_and_end_column) { TEST(YogaTest, margin_auto_start_and_end_column) {
const YGNodeRef root = YGNodeNew(); const YGConfigRef config = YGConfigNew();
const YGNodeRef root = YGNodeNewWithConfig(config);
YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow); YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow);
YGNodeStyleSetAlignItems(root, YGAlignCenter); YGNodeStyleSetAlignItems(root, YGAlignCenter);
YGNodeStyleSetWidth(root, 200); YGNodeStyleSetWidth(root, 200);
YGNodeStyleSetHeight(root, 200); YGNodeStyleSetHeight(root, 200);
const YGNodeRef root_child0 = YGNodeNew(); const YGNodeRef root_child0 = YGNodeNewWithConfig(config);
YGNodeStyleSetMarginAuto(root_child0, YGEdgeStart); YGNodeStyleSetMarginAuto(root_child0, YGEdgeStart);
YGNodeStyleSetMarginAuto(root_child0, YGEdgeEnd); YGNodeStyleSetMarginAuto(root_child0, YGEdgeEnd);
YGNodeStyleSetWidth(root_child0, 50); YGNodeStyleSetWidth(root_child0, 50);
YGNodeStyleSetHeight(root_child0, 50); YGNodeStyleSetHeight(root_child0, 50);
YGNodeInsertChild(root, root_child0, 0); YGNodeInsertChild(root, root_child0, 0);
const YGNodeRef root_child1 = YGNodeNew(); const YGNodeRef root_child1 = YGNodeNewWithConfig(config);
YGNodeStyleSetWidth(root_child1, 50); YGNodeStyleSetWidth(root_child1, 50);
YGNodeStyleSetHeight(root_child1, 50); YGNodeStyleSetHeight(root_child1, 50);
YGNodeInsertChild(root, root_child1, 1); YGNodeInsertChild(root, root_child1, 1);
@@ -997,21 +999,25 @@ TEST(YogaTest, margin_auto_start_and_end_column) {
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetHeight(root_child1)); ASSERT_FLOAT_EQ(50, YGNodeLayoutGetHeight(root_child1));
YGNodeFreeRecursive(root); YGNodeFreeRecursive(root);
YGConfigFree(config);
} }
TEST(YogaTest, margin_auto_start_and_end) { TEST(YogaTest, margin_auto_start_and_end) {
const YGNodeRef root = YGNodeNew(); const YGConfigRef config = YGConfigNew();
const YGNodeRef root = YGNodeNewWithConfig(config);
YGNodeStyleSetWidth(root, 200); YGNodeStyleSetWidth(root, 200);
YGNodeStyleSetHeight(root, 200); YGNodeStyleSetHeight(root, 200);
const YGNodeRef root_child0 = YGNodeNew(); const YGNodeRef root_child0 = YGNodeNewWithConfig(config);
YGNodeStyleSetMarginAuto(root_child0, YGEdgeStart); YGNodeStyleSetMarginAuto(root_child0, YGEdgeStart);
YGNodeStyleSetMarginAuto(root_child0, YGEdgeEnd); YGNodeStyleSetMarginAuto(root_child0, YGEdgeEnd);
YGNodeStyleSetWidth(root_child0, 50); YGNodeStyleSetWidth(root_child0, 50);
YGNodeStyleSetHeight(root_child0, 50); YGNodeStyleSetHeight(root_child0, 50);
YGNodeInsertChild(root, root_child0, 0); YGNodeInsertChild(root, root_child0, 0);
const YGNodeRef root_child1 = YGNodeNew(); const YGNodeRef root_child1 = YGNodeNewWithConfig(config);
YGNodeStyleSetWidth(root_child1, 50); YGNodeStyleSetWidth(root_child1, 50);
YGNodeStyleSetHeight(root_child1, 50); YGNodeStyleSetHeight(root_child1, 50);
YGNodeInsertChild(root, root_child1, 1); YGNodeInsertChild(root, root_child1, 1);
@@ -1050,6 +1056,8 @@ TEST(YogaTest, margin_auto_start_and_end) {
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetHeight(root_child1)); ASSERT_FLOAT_EQ(50, YGNodeLayoutGetHeight(root_child1));
YGNodeFreeRecursive(root); YGNodeFreeRecursive(root);
YGConfigFree(config);
} }
TEST(YogaTest, margin_auto_left_and_right_column_and_center) { TEST(YogaTest, margin_auto_left_and_right_column_and_center) {