From 56d06e27cfeeddfc99685632ff4e78077fddc37e Mon Sep 17 00:00:00 2001 From: Emil Sjolander Date: Fri, 3 Feb 2017 11:19:45 -0800 Subject: [PATCH] Pass parent with down with calculateLayout to allow percentages on root node Summary: For percentage paddings/margins/sizes to work on the root node we need to have the ability to pass down the parent sizes. This has always been possible with the C API but was never exposed to java. This diff exposes this functionality. Reviewed By: astreet Differential Revision: D4501016 fbshipit-source-id: 0c9502e86ff200c021c78afb7ac4b48cf11b3bdb --- gentest/gentest-java.js | 2 +- java/com/facebook/yoga/YogaNode.java | 6 +- java/com/facebook/yoga/YogaNodeAPI.java | 2 +- java/jni/YGJNI.cpp | 6 +- .../facebook/yoga/YGAbsolutePositionTest.java | 60 +++++++-------- .../com/facebook/yoga/YGAlignContentTest.java | 16 ++-- .../com/facebook/yoga/YGAlignItemsTest.java | 76 +++++++++---------- .../com/facebook/yoga/YGAlignSelfTest.java | 20 ++--- .../tests/com/facebook/yoga/YGBorderTest.java | 20 ++--- .../com/facebook/yoga/YGDimensionTest.java | 8 +- .../facebook/yoga/YGFlexDirectionTest.java | 24 +++--- java/tests/com/facebook/yoga/YGFlexTest.java | 28 +++---- .../com/facebook/yoga/YGFlexWrapTest.java | 20 ++--- .../facebook/yoga/YGJustifyContentTest.java | 40 +++++----- .../tests/com/facebook/yoga/YGMarginTest.java | 40 +++++----- .../facebook/yoga/YGMinMaxDimensionTest.java | 52 ++++++------- .../com/facebook/yoga/YGPaddingTest.java | 24 +++--- .../com/facebook/yoga/YGPercentageTest.java | 68 ++++++++--------- .../com/facebook/yoga/YGRoundingTest.java | 40 +++++----- .../com/facebook/yoga/YGSizeOverflowTest.java | 12 +-- .../tests/com/facebook/yoga/YogaNodeTest.java | 26 +++++-- 21 files changed, 301 insertions(+), 289 deletions(-) diff --git a/gentest/gentest-java.js b/gentest/gentest-java.js index 1c510c48..32b3d99b 100644 --- a/gentest/gentest-java.js +++ b/gentest/gentest-java.js @@ -137,7 +137,7 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, { YGNodeCalculateLayout:{value:function(node, dir) { this.push(node + '.setDirection(' + dir + ');'); - this.push(node + '.calculateLayout();'); + this.push(node + '.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);'); }}, YGNodeInsertChild:{value:function(parentName, nodeName, index) { diff --git a/java/com/facebook/yoga/YogaNode.java b/java/com/facebook/yoga/YogaNode.java index 504e3852..9ac26219 100644 --- a/java/com/facebook/yoga/YogaNode.java +++ b/java/com/facebook/yoga/YogaNode.java @@ -172,10 +172,10 @@ public class YogaNode implements YogaNodeAPI { return mChildren == null ? -1 : mChildren.indexOf(child); } - private native void jni_YGNodeCalculateLayout(long nativePointer); + private native void jni_YGNodeCalculateLayout(long nativePointer, float width, float height); @Override - public void calculateLayout() { - jni_YGNodeCalculateLayout(mNativePointer); + public void calculateLayout(float width, float height) { + jni_YGNodeCalculateLayout(mNativePointer, width, height); } private native boolean jni_YGNodeHasNewLayout(long nativePointer); diff --git a/java/com/facebook/yoga/YogaNodeAPI.java b/java/com/facebook/yoga/YogaNodeAPI.java index b4a43b70..2dcfa409 100644 --- a/java/com/facebook/yoga/YogaNodeAPI.java +++ b/java/com/facebook/yoga/YogaNodeAPI.java @@ -20,7 +20,7 @@ public interface YogaNodeAPI { void setMeasureFunction(YogaMeasureFunction measureFunction); void setBaselineFunction(YogaBaselineFunction measureFunction); boolean isMeasureDefined(); - void calculateLayout(); + void calculateLayout(float width, float height); boolean isDirty(); boolean hasNewLayout(); void dirty(); diff --git a/java/jni/YGJNI.cpp b/java/jni/YGJNI.cpp index dd540bb4..88044a96 100644 --- a/java/jni/YGJNI.cpp +++ b/java/jni/YGJNI.cpp @@ -202,11 +202,11 @@ void jni_YGNodeRemoveChild(alias_ref, jlong nativePointer, jlong childP YGNodeRemoveChild(_jlong2YGNodeRef(nativePointer), _jlong2YGNodeRef(childPointer)); } -void jni_YGNodeCalculateLayout(alias_ref, jlong nativePointer) { +void jni_YGNodeCalculateLayout(alias_ref, jlong nativePointer, jfloat width, jfloat height) { const YGNodeRef root = _jlong2YGNodeRef(nativePointer); YGNodeCalculateLayout(root, - YGUndefined, - YGUndefined, + static_cast(width), + static_cast(height), YGNodeStyleGetDirection(_jlong2YGNodeRef(nativePointer))); YGTransferLayoutOutputsRecursive(root); } diff --git a/java/tests/com/facebook/yoga/YGAbsolutePositionTest.java b/java/tests/com/facebook/yoga/YGAbsolutePositionTest.java index b84d8d13..8d1d1977 100644 --- a/java/tests/com/facebook/yoga/YGAbsolutePositionTest.java +++ b/java/tests/com/facebook/yoga/YGAbsolutePositionTest.java @@ -30,7 +30,7 @@ public class YGAbsolutePositionTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -43,7 +43,7 @@ public class YGAbsolutePositionTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -70,7 +70,7 @@ public class YGAbsolutePositionTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -83,7 +83,7 @@ public class YGAbsolutePositionTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -110,7 +110,7 @@ public class YGAbsolutePositionTest { root_child0.setPosition(YogaEdge.BOTTOM, 10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -123,7 +123,7 @@ public class YGAbsolutePositionTest { assertEquals(80f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -152,7 +152,7 @@ public class YGAbsolutePositionTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -165,7 +165,7 @@ public class YGAbsolutePositionTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -197,7 +197,7 @@ public class YGAbsolutePositionTest { root_child0_child0.setHeight(100f); root_child0.addChildAt(root_child0_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -215,7 +215,7 @@ public class YGAbsolutePositionTest { assertEquals(100f, root_child0_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -267,7 +267,7 @@ public class YGAbsolutePositionTest { root_child1.setHeight(50f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(10f, root.getLayoutX(), 0.0f); assertEquals(10f, root.getLayoutY(), 0.0f); @@ -285,7 +285,7 @@ public class YGAbsolutePositionTest { assertEquals(50f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(10f, root.getLayoutX(), 0.0f); assertEquals(10f, root.getLayoutY(), 0.0f); @@ -318,7 +318,7 @@ public class YGAbsolutePositionTest { root_child0.setHeight(40f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -331,7 +331,7 @@ public class YGAbsolutePositionTest { assertEquals(40f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -359,7 +359,7 @@ public class YGAbsolutePositionTest { root_child0.setHeight(40f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -372,7 +372,7 @@ public class YGAbsolutePositionTest { assertEquals(40f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -399,7 +399,7 @@ public class YGAbsolutePositionTest { root_child0.setHeight(40f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -412,7 +412,7 @@ public class YGAbsolutePositionTest { assertEquals(40f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -439,7 +439,7 @@ public class YGAbsolutePositionTest { root_child0.setHeight(40f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -452,7 +452,7 @@ public class YGAbsolutePositionTest { assertEquals(40f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -479,7 +479,7 @@ public class YGAbsolutePositionTest { root_child0.setHeight(40f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -492,7 +492,7 @@ public class YGAbsolutePositionTest { assertEquals(40f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -521,7 +521,7 @@ public class YGAbsolutePositionTest { root_child0.setHeight(40f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -534,7 +534,7 @@ public class YGAbsolutePositionTest { assertEquals(40f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -563,7 +563,7 @@ public class YGAbsolutePositionTest { root_child0.setHeight(40f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -576,7 +576,7 @@ public class YGAbsolutePositionTest { assertEquals(40f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -605,7 +605,7 @@ public class YGAbsolutePositionTest { root_child0.setHeight(40f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -618,7 +618,7 @@ public class YGAbsolutePositionTest { assertEquals(40f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -647,7 +647,7 @@ public class YGAbsolutePositionTest { root_child0.setHeight(40f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -660,7 +660,7 @@ public class YGAbsolutePositionTest { assertEquals(40f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YGAlignContentTest.java b/java/tests/com/facebook/yoga/YGAlignContentTest.java index 16a838ff..5c57fc4c 100644 --- a/java/tests/com/facebook/yoga/YGAlignContentTest.java +++ b/java/tests/com/facebook/yoga/YGAlignContentTest.java @@ -48,7 +48,7 @@ public class YGAlignContentTest { root_child4.setHeight(10f); root.addChildAt(root_child4, 4); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -81,7 +81,7 @@ public class YGAlignContentTest { assertEquals(10f, root_child4.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -147,7 +147,7 @@ public class YGAlignContentTest { root_child4.setHeight(10f); root.addChildAt(root_child4, 4); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -180,7 +180,7 @@ public class YGAlignContentTest { assertEquals(10f, root_child4.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -246,7 +246,7 @@ public class YGAlignContentTest { root_child4.setHeight(10f); root.addChildAt(root_child4, 4); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -279,7 +279,7 @@ public class YGAlignContentTest { assertEquals(10f, root_child4.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -340,7 +340,7 @@ public class YGAlignContentTest { root_child4.setWidth(50f); root.addChildAt(root_child4, 4); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -373,7 +373,7 @@ public class YGAlignContentTest { assertEquals(0f, root_child4.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YGAlignItemsTest.java b/java/tests/com/facebook/yoga/YGAlignItemsTest.java index 4dab2982..76fe9f7f 100644 --- a/java/tests/com/facebook/yoga/YGAlignItemsTest.java +++ b/java/tests/com/facebook/yoga/YGAlignItemsTest.java @@ -26,7 +26,7 @@ public class YGAlignItemsTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -39,7 +39,7 @@ public class YGAlignItemsTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -64,7 +64,7 @@ public class YGAlignItemsTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -77,7 +77,7 @@ public class YGAlignItemsTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -102,7 +102,7 @@ public class YGAlignItemsTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -115,7 +115,7 @@ public class YGAlignItemsTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -140,7 +140,7 @@ public class YGAlignItemsTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -153,7 +153,7 @@ public class YGAlignItemsTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -184,7 +184,7 @@ public class YGAlignItemsTest { root_child1.setHeight(20f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -202,7 +202,7 @@ public class YGAlignItemsTest { assertEquals(20f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -243,7 +243,7 @@ public class YGAlignItemsTest { root_child1_child0.setHeight(10f); root_child1.addChildAt(root_child1_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -266,7 +266,7 @@ public class YGAlignItemsTest { assertEquals(10f, root_child1_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -329,7 +329,7 @@ public class YGAlignItemsTest { root_child1_child3.setHeight(10f); root_child1.addChildAt(root_child1_child3, 3); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -367,7 +367,7 @@ public class YGAlignItemsTest { assertEquals(10f, root_child1_child3.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -447,7 +447,7 @@ public class YGAlignItemsTest { root_child1_child3.setHeight(10f); root_child1.addChildAt(root_child1_child3, 3); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -485,7 +485,7 @@ public class YGAlignItemsTest { assertEquals(10f, root_child1_child3.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -564,7 +564,7 @@ public class YGAlignItemsTest { root_child1_child3.setHeight(10f); root_child1.addChildAt(root_child1_child3, 3); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -602,7 +602,7 @@ public class YGAlignItemsTest { assertEquals(10f, root_child1_child3.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -664,7 +664,7 @@ public class YGAlignItemsTest { root_child1_child0.setHeight(10f); root_child1.addChildAt(root_child1_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -687,7 +687,7 @@ public class YGAlignItemsTest { assertEquals(10f, root_child1_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -734,7 +734,7 @@ public class YGAlignItemsTest { root_child1_child0.setHeight(10f); root_child1.addChildAt(root_child1_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -757,7 +757,7 @@ public class YGAlignItemsTest { assertEquals(10f, root_child1_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -808,7 +808,7 @@ public class YGAlignItemsTest { root_child1_child0.setHeight(15f); root_child1.addChildAt(root_child1_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -836,7 +836,7 @@ public class YGAlignItemsTest { assertEquals(15f, root_child1_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -881,7 +881,7 @@ public class YGAlignItemsTest { root_child1.setHeight(20f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -899,7 +899,7 @@ public class YGAlignItemsTest { assertEquals(20f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -948,7 +948,7 @@ public class YGAlignItemsTest { root_child1_child0.setHeight(10f); root_child1.addChildAt(root_child1_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -971,7 +971,7 @@ public class YGAlignItemsTest { assertEquals(10f, root_child1_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -1025,7 +1025,7 @@ public class YGAlignItemsTest { root_child1_child0.setHeight(10f); root_child1.addChildAt(root_child1_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -1048,7 +1048,7 @@ public class YGAlignItemsTest { assertEquals(10f, root_child1_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -1110,7 +1110,7 @@ public class YGAlignItemsTest { root_child3.setHeight(50f); root.addChildAt(root_child3, 3); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -1148,7 +1148,7 @@ public class YGAlignItemsTest { assertEquals(50f, root_child3.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -1224,7 +1224,7 @@ public class YGAlignItemsTest { root_child3.setHeight(20f); root.addChildAt(root_child3, 3); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -1262,7 +1262,7 @@ public class YGAlignItemsTest { assertEquals(20f, root_child3.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -1338,7 +1338,7 @@ public class YGAlignItemsTest { root_child3.setHeight(20f); root.addChildAt(root_child3, 3); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -1376,7 +1376,7 @@ public class YGAlignItemsTest { assertEquals(20f, root_child3.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -1453,7 +1453,7 @@ public class YGAlignItemsTest { root_child3.setHeight(20f); root.addChildAt(root_child3, 3); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -1491,7 +1491,7 @@ public class YGAlignItemsTest { assertEquals(20f, root_child3.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YGAlignSelfTest.java b/java/tests/com/facebook/yoga/YGAlignSelfTest.java index d314c4a9..6b69ac6a 100644 --- a/java/tests/com/facebook/yoga/YGAlignSelfTest.java +++ b/java/tests/com/facebook/yoga/YGAlignSelfTest.java @@ -28,7 +28,7 @@ public class YGAlignSelfTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -41,7 +41,7 @@ public class YGAlignSelfTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -66,7 +66,7 @@ public class YGAlignSelfTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -79,7 +79,7 @@ public class YGAlignSelfTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -104,7 +104,7 @@ public class YGAlignSelfTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -117,7 +117,7 @@ public class YGAlignSelfTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -143,7 +143,7 @@ public class YGAlignSelfTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -156,7 +156,7 @@ public class YGAlignSelfTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -193,7 +193,7 @@ public class YGAlignSelfTest { root_child1_child0.setHeight(10f); root_child1.addChildAt(root_child1_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -216,7 +216,7 @@ public class YGAlignSelfTest { assertEquals(10f, root_child1_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YGBorderTest.java b/java/tests/com/facebook/yoga/YGBorderTest.java index 26e13407..595204fd 100644 --- a/java/tests/com/facebook/yoga/YGBorderTest.java +++ b/java/tests/com/facebook/yoga/YGBorderTest.java @@ -24,7 +24,7 @@ public class YGBorderTest { root.setBorder(YogaEdge.RIGHT, 10f); root.setBorder(YogaEdge.BOTTOM, 10f); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -32,7 +32,7 @@ public class YGBorderTest { assertEquals(20f, root.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -53,7 +53,7 @@ public class YGBorderTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -66,7 +66,7 @@ public class YGBorderTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -94,7 +94,7 @@ public class YGBorderTest { root_child0.setWidth(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -107,7 +107,7 @@ public class YGBorderTest { assertEquals(80f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -134,7 +134,7 @@ public class YGBorderTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -147,7 +147,7 @@ public class YGBorderTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -176,7 +176,7 @@ public class YGBorderTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -189,7 +189,7 @@ public class YGBorderTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YGDimensionTest.java b/java/tests/com/facebook/yoga/YGDimensionTest.java index f4ab0a50..fcef929e 100644 --- a/java/tests/com/facebook/yoga/YGDimensionTest.java +++ b/java/tests/com/facebook/yoga/YGDimensionTest.java @@ -25,7 +25,7 @@ public class YGDimensionTest { root_child0.setHeight(100f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -38,7 +38,7 @@ public class YGDimensionTest { assertEquals(100f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -63,7 +63,7 @@ public class YGDimensionTest { root_child0_child0.setHeight(100f); root_child0.addChildAt(root_child0_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -81,7 +81,7 @@ public class YGDimensionTest { assertEquals(100f, root_child0_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YGFlexDirectionTest.java b/java/tests/com/facebook/yoga/YGFlexDirectionTest.java index be79dc2d..c726b943 100644 --- a/java/tests/com/facebook/yoga/YGFlexDirectionTest.java +++ b/java/tests/com/facebook/yoga/YGFlexDirectionTest.java @@ -33,7 +33,7 @@ public class YGFlexDirectionTest { root_child2.setHeight(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -56,7 +56,7 @@ public class YGFlexDirectionTest { assertEquals(10f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -97,7 +97,7 @@ public class YGFlexDirectionTest { root_child2.setWidth(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -120,7 +120,7 @@ public class YGFlexDirectionTest { assertEquals(100f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -161,7 +161,7 @@ public class YGFlexDirectionTest { root_child2.setHeight(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -184,7 +184,7 @@ public class YGFlexDirectionTest { assertEquals(10f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -226,7 +226,7 @@ public class YGFlexDirectionTest { root_child2.setWidth(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -249,7 +249,7 @@ public class YGFlexDirectionTest { assertEquals(100f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -291,7 +291,7 @@ public class YGFlexDirectionTest { root_child2.setHeight(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -314,7 +314,7 @@ public class YGFlexDirectionTest { assertEquals(10f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -356,7 +356,7 @@ public class YGFlexDirectionTest { root_child2.setWidth(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -379,7 +379,7 @@ public class YGFlexDirectionTest { assertEquals(100f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YGFlexTest.java b/java/tests/com/facebook/yoga/YGFlexTest.java index 1407b4dd..2d6d8ad4 100644 --- a/java/tests/com/facebook/yoga/YGFlexTest.java +++ b/java/tests/com/facebook/yoga/YGFlexTest.java @@ -31,7 +31,7 @@ public class YGFlexTest { root_child1.setFlexGrow(1f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -49,7 +49,7 @@ public class YGFlexTest { assertEquals(25f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -83,7 +83,7 @@ public class YGFlexTest { root_child1.setFlexGrow(1f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -101,7 +101,7 @@ public class YGFlexTest { assertEquals(100f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -134,7 +134,7 @@ public class YGFlexTest { root_child1.setFlexBasis(50f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -152,7 +152,7 @@ public class YGFlexTest { assertEquals(50f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -186,7 +186,7 @@ public class YGFlexTest { root_child1.setFlexBasis(50f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -204,7 +204,7 @@ public class YGFlexTest { assertEquals(100f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -243,7 +243,7 @@ public class YGFlexTest { root_child2.setHeight(50f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -266,7 +266,7 @@ public class YGFlexTest { assertEquals(50f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -311,7 +311,7 @@ public class YGFlexTest { root_child2.setHeight(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -334,7 +334,7 @@ public class YGFlexTest { assertEquals(20f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -371,7 +371,7 @@ public class YGFlexTest { root_child0_child0.setFlexShrink(1f); root_child0.addChildAt(root_child0_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -389,7 +389,7 @@ public class YGFlexTest { assertEquals(0f, root_child0_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YGFlexWrapTest.java b/java/tests/com/facebook/yoga/YGFlexWrapTest.java index c731234d..6ef0d1f2 100644 --- a/java/tests/com/facebook/yoga/YGFlexWrapTest.java +++ b/java/tests/com/facebook/yoga/YGFlexWrapTest.java @@ -42,7 +42,7 @@ public class YGFlexWrapTest { root_child3.setHeight(30f); root.addChildAt(root_child3, 3); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -70,7 +70,7 @@ public class YGFlexWrapTest { assertEquals(30f, root_child3.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -125,7 +125,7 @@ public class YGFlexWrapTest { root_child3.setHeight(30f); root.addChildAt(root_child3, 3); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -153,7 +153,7 @@ public class YGFlexWrapTest { assertEquals(30f, root_child3.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -209,7 +209,7 @@ public class YGFlexWrapTest { root_child3.setHeight(30f); root.addChildAt(root_child3, 3); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -237,7 +237,7 @@ public class YGFlexWrapTest { assertEquals(30f, root_child3.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -293,7 +293,7 @@ public class YGFlexWrapTest { root_child3.setHeight(30f); root.addChildAt(root_child3, 3); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -321,7 +321,7 @@ public class YGFlexWrapTest { assertEquals(30f, root_child3.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -368,7 +368,7 @@ public class YGFlexWrapTest { root_child1.setHeight(50f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -386,7 +386,7 @@ public class YGFlexWrapTest { assertEquals(50f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YGJustifyContentTest.java b/java/tests/com/facebook/yoga/YGJustifyContentTest.java index 7332b6de..62985de9 100644 --- a/java/tests/com/facebook/yoga/YGJustifyContentTest.java +++ b/java/tests/com/facebook/yoga/YGJustifyContentTest.java @@ -35,7 +35,7 @@ public class YGJustifyContentTest { root_child2.setWidth(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -58,7 +58,7 @@ public class YGJustifyContentTest { assertEquals(102f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -101,7 +101,7 @@ public class YGJustifyContentTest { root_child2.setWidth(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -124,7 +124,7 @@ public class YGJustifyContentTest { assertEquals(102f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -167,7 +167,7 @@ public class YGJustifyContentTest { root_child2.setWidth(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -190,7 +190,7 @@ public class YGJustifyContentTest { assertEquals(102f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -233,7 +233,7 @@ public class YGJustifyContentTest { root_child2.setWidth(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -256,7 +256,7 @@ public class YGJustifyContentTest { assertEquals(102f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -299,7 +299,7 @@ public class YGJustifyContentTest { root_child2.setWidth(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -322,7 +322,7 @@ public class YGJustifyContentTest { assertEquals(102f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -362,7 +362,7 @@ public class YGJustifyContentTest { root_child2.setHeight(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -385,7 +385,7 @@ public class YGJustifyContentTest { assertEquals(10f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -427,7 +427,7 @@ public class YGJustifyContentTest { root_child2.setHeight(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -450,7 +450,7 @@ public class YGJustifyContentTest { assertEquals(10f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -492,7 +492,7 @@ public class YGJustifyContentTest { root_child2.setHeight(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -515,7 +515,7 @@ public class YGJustifyContentTest { assertEquals(10f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -557,7 +557,7 @@ public class YGJustifyContentTest { root_child2.setHeight(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -580,7 +580,7 @@ public class YGJustifyContentTest { assertEquals(10f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -622,7 +622,7 @@ public class YGJustifyContentTest { root_child2.setHeight(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -645,7 +645,7 @@ public class YGJustifyContentTest { assertEquals(10f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YGMarginTest.java b/java/tests/com/facebook/yoga/YGMarginTest.java index f214ce8c..8b6a159c 100644 --- a/java/tests/com/facebook/yoga/YGMarginTest.java +++ b/java/tests/com/facebook/yoga/YGMarginTest.java @@ -28,7 +28,7 @@ public class YGMarginTest { root_child0.setWidth(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -41,7 +41,7 @@ public class YGMarginTest { assertEquals(100f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -65,7 +65,7 @@ public class YGMarginTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -78,7 +78,7 @@ public class YGMarginTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -104,7 +104,7 @@ public class YGMarginTest { root_child0.setWidth(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -117,7 +117,7 @@ public class YGMarginTest { assertEquals(100f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -142,7 +142,7 @@ public class YGMarginTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -155,7 +155,7 @@ public class YGMarginTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -181,7 +181,7 @@ public class YGMarginTest { root_child0.setMargin(YogaEdge.END, 10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -194,7 +194,7 @@ public class YGMarginTest { assertEquals(100f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -219,7 +219,7 @@ public class YGMarginTest { root_child0.setMargin(YogaEdge.BOTTOM, 10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -232,7 +232,7 @@ public class YGMarginTest { assertEquals(80f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -258,7 +258,7 @@ public class YGMarginTest { root_child0.setMargin(YogaEdge.BOTTOM, 10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -271,7 +271,7 @@ public class YGMarginTest { assertEquals(80f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -296,7 +296,7 @@ public class YGMarginTest { root_child0.setMargin(YogaEdge.END, 10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -309,7 +309,7 @@ public class YGMarginTest { assertEquals(100f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -338,7 +338,7 @@ public class YGMarginTest { root_child1.setFlexGrow(1f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -356,7 +356,7 @@ public class YGMarginTest { assertEquals(100f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -389,7 +389,7 @@ public class YGMarginTest { root_child1.setFlexGrow(1f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -407,7 +407,7 @@ public class YGMarginTest { assertEquals(45f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YGMinMaxDimensionTest.java b/java/tests/com/facebook/yoga/YGMinMaxDimensionTest.java index 58d37c45..66f45832 100644 --- a/java/tests/com/facebook/yoga/YGMinMaxDimensionTest.java +++ b/java/tests/com/facebook/yoga/YGMinMaxDimensionTest.java @@ -27,7 +27,7 @@ public class YGMinMaxDimensionTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -40,7 +40,7 @@ public class YGMinMaxDimensionTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -65,7 +65,7 @@ public class YGMinMaxDimensionTest { root_child0.setMaxHeight(50f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -78,7 +78,7 @@ public class YGMinMaxDimensionTest { assertEquals(50f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -106,7 +106,7 @@ public class YGMinMaxDimensionTest { root_child1.setFlexGrow(1f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -124,7 +124,7 @@ public class YGMinMaxDimensionTest { assertEquals(20f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -158,7 +158,7 @@ public class YGMinMaxDimensionTest { root_child1.setFlexGrow(1f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -176,7 +176,7 @@ public class YGMinMaxDimensionTest { assertEquals(100f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -207,7 +207,7 @@ public class YGMinMaxDimensionTest { root_child0.setHeight(60f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -220,7 +220,7 @@ public class YGMinMaxDimensionTest { assertEquals(60f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -246,7 +246,7 @@ public class YGMinMaxDimensionTest { root_child0.setHeight(60f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -259,7 +259,7 @@ public class YGMinMaxDimensionTest { assertEquals(60f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -294,7 +294,7 @@ public class YGMinMaxDimensionTest { root_child2.setHeight(50f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -317,7 +317,7 @@ public class YGMinMaxDimensionTest { assertEquals(50f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -356,7 +356,7 @@ public class YGMinMaxDimensionTest { root_child0_child0.setHeight(20f); root_child0.addChildAt(root_child0_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -374,7 +374,7 @@ public class YGMinMaxDimensionTest { assertEquals(20f, root_child0_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -408,7 +408,7 @@ public class YGMinMaxDimensionTest { root_child0_child0.setHeight(20f); root_child0.addChildAt(root_child0_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -426,7 +426,7 @@ public class YGMinMaxDimensionTest { assertEquals(20f, root_child0_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -459,7 +459,7 @@ public class YGMinMaxDimensionTest { root_child1.setWidth(50f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -477,7 +477,7 @@ public class YGMinMaxDimensionTest { assertEquals(100f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -508,7 +508,7 @@ public class YGMinMaxDimensionTest { root_child1.setHeight(50f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -526,7 +526,7 @@ public class YGMinMaxDimensionTest { assertEquals(50f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -564,7 +564,7 @@ public class YGMinMaxDimensionTest { root_child0_child1.setWidth(50f); root_child0.addChildAt(root_child0_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -587,7 +587,7 @@ public class YGMinMaxDimensionTest { assertEquals(100f, root_child0_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -625,7 +625,7 @@ public class YGMinMaxDimensionTest { root_child1.setHeight(50f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -643,7 +643,7 @@ public class YGMinMaxDimensionTest { assertEquals(50f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YGPaddingTest.java b/java/tests/com/facebook/yoga/YGPaddingTest.java index 9b652e24..4b3fb653 100644 --- a/java/tests/com/facebook/yoga/YGPaddingTest.java +++ b/java/tests/com/facebook/yoga/YGPaddingTest.java @@ -24,7 +24,7 @@ public class YGPaddingTest { root.setPadding(YogaEdge.RIGHT, 10); root.setPadding(YogaEdge.BOTTOM, 10); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -32,7 +32,7 @@ public class YGPaddingTest { assertEquals(20f, root.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -53,7 +53,7 @@ public class YGPaddingTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -66,7 +66,7 @@ public class YGPaddingTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -94,7 +94,7 @@ public class YGPaddingTest { root_child0.setWidth(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -107,7 +107,7 @@ public class YGPaddingTest { assertEquals(80f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -134,7 +134,7 @@ public class YGPaddingTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -147,7 +147,7 @@ public class YGPaddingTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -176,7 +176,7 @@ public class YGPaddingTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -189,7 +189,7 @@ public class YGPaddingTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -219,7 +219,7 @@ public class YGPaddingTest { root_child0.setHeight(100f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -232,7 +232,7 @@ public class YGPaddingTest { assertEquals(100f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YGPercentageTest.java b/java/tests/com/facebook/yoga/YGPercentageTest.java index f87981ca..f43ccb6b 100644 --- a/java/tests/com/facebook/yoga/YGPercentageTest.java +++ b/java/tests/com/facebook/yoga/YGPercentageTest.java @@ -30,7 +30,7 @@ public class YGPercentageTest { root_child0.setHeightPercent(30f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -43,7 +43,7 @@ public class YGPercentageTest { assertEquals(60f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -74,7 +74,7 @@ public class YGPercentageTest { root_child0.setHeightPercent(55f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -87,7 +87,7 @@ public class YGPercentageTest { assertEquals(220f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -118,7 +118,7 @@ public class YGPercentageTest { root_child0.setHeightPercent(15f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -131,7 +131,7 @@ public class YGPercentageTest { assertEquals(75f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -165,7 +165,7 @@ public class YGPercentageTest { root_child1.setFlexBasisPercent(25f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -183,7 +183,7 @@ public class YGPercentageTest { assertEquals(200f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -221,7 +221,7 @@ public class YGPercentageTest { root_child1.setFlexBasisPercent(25f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -239,7 +239,7 @@ public class YGPercentageTest { assertEquals(75f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -277,7 +277,7 @@ public class YGPercentageTest { root_child1.setMinHeightPercent(10f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -295,7 +295,7 @@ public class YGPercentageTest { assertEquals(60f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -336,7 +336,7 @@ public class YGPercentageTest { root_child1.setMaxHeightPercent(20f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -354,7 +354,7 @@ public class YGPercentageTest { assertEquals(40f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -394,7 +394,7 @@ public class YGPercentageTest { root_child1.setMaxHeightPercent(20f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -412,7 +412,7 @@ public class YGPercentageTest { assertEquals(40f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -453,7 +453,7 @@ public class YGPercentageTest { root_child1.setMaxWidthPercent(20f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -471,7 +471,7 @@ public class YGPercentageTest { assertEquals(200f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -511,7 +511,7 @@ public class YGPercentageTest { root_child1.setMaxWidthPercent(20f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -529,7 +529,7 @@ public class YGPercentageTest { assertEquals(150f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -570,7 +570,7 @@ public class YGPercentageTest { root_child1.setMinWidthPercent(20f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -588,7 +588,7 @@ public class YGPercentageTest { assertEquals(200f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -628,7 +628,7 @@ public class YGPercentageTest { root_child1.setMinWidthPercent(20f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -646,7 +646,7 @@ public class YGPercentageTest { assertEquals(150f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -718,7 +718,7 @@ public class YGPercentageTest { root_child1.setMinWidthPercent(20f); root.addChildAt(root_child1, 1); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -746,7 +746,7 @@ public class YGPercentageTest { assertEquals(142f, root_child1.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -797,7 +797,7 @@ public class YGPercentageTest { root_child0_child0.setHeight(10f); root_child0.addChildAt(root_child0_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -815,7 +815,7 @@ public class YGPercentageTest { assertEquals(10f, root_child0_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -856,7 +856,7 @@ public class YGPercentageTest { root_child0_child0.setHeight(10f); root_child0.addChildAt(root_child0_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -874,7 +874,7 @@ public class YGPercentageTest { assertEquals(10f, root_child0_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -910,7 +910,7 @@ public class YGPercentageTest { root_child0.setHeight(10f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -923,7 +923,7 @@ public class YGPercentageTest { assertEquals(10f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -947,7 +947,7 @@ public class YGPercentageTest { root_child0.setHeightPercent(50f); root.addChildAt(root_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -960,7 +960,7 @@ public class YGPercentageTest { assertEquals(0f, root_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YGRoundingTest.java b/java/tests/com/facebook/yoga/YGRoundingTest.java index 77d40e00..da59ee3c 100644 --- a/java/tests/com/facebook/yoga/YGRoundingTest.java +++ b/java/tests/com/facebook/yoga/YGRoundingTest.java @@ -37,7 +37,7 @@ public class YGRoundingTest { root_child2.setFlexGrow(1f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -60,7 +60,7 @@ public class YGRoundingTest { assertEquals(100f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -114,7 +114,7 @@ public class YGRoundingTest { root_child4.setFlexGrow(1f); root.addChildAt(root_child4, 4); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -147,7 +147,7 @@ public class YGRoundingTest { assertEquals(100f, root_child4.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -204,7 +204,7 @@ public class YGRoundingTest { root_child2.setFlexBasis(25f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -227,7 +227,7 @@ public class YGRoundingTest { assertEquals(100f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -276,7 +276,7 @@ public class YGRoundingTest { root_child2.setHeight(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -299,7 +299,7 @@ public class YGRoundingTest { assertEquals(24f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -348,7 +348,7 @@ public class YGRoundingTest { root_child2.setHeight(10.7f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -371,7 +371,7 @@ public class YGRoundingTest { assertEquals(24f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -434,7 +434,7 @@ public class YGRoundingTest { root_child2.setHeight(10.7f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -467,7 +467,7 @@ public class YGRoundingTest { assertEquals(24f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -526,7 +526,7 @@ public class YGRoundingTest { root_child2.setHeight(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -549,7 +549,7 @@ public class YGRoundingTest { assertEquals(24f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -598,7 +598,7 @@ public class YGRoundingTest { root_child2.setHeight(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -621,7 +621,7 @@ public class YGRoundingTest { assertEquals(25f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -671,7 +671,7 @@ public class YGRoundingTest { root_child2.setHeight(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -694,7 +694,7 @@ public class YGRoundingTest { assertEquals(24f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -744,7 +744,7 @@ public class YGRoundingTest { root_child2.setHeight(10f); root.addChildAt(root_child2, 2); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(1f, root.getLayoutY(), 0.0f); @@ -767,7 +767,7 @@ public class YGRoundingTest { assertEquals(24f, root_child2.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(1f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YGSizeOverflowTest.java b/java/tests/com/facebook/yoga/YGSizeOverflowTest.java index b353c359..d54719a3 100644 --- a/java/tests/com/facebook/yoga/YGSizeOverflowTest.java +++ b/java/tests/com/facebook/yoga/YGSizeOverflowTest.java @@ -30,7 +30,7 @@ public class YGSizeOverflowTest { root_child0_child0.setHeight(200f); root_child0.addChildAt(root_child0_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -48,7 +48,7 @@ public class YGSizeOverflowTest { assertEquals(200f, root_child0_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -82,7 +82,7 @@ public class YGSizeOverflowTest { root_child0_child0.setHeight(200f); root_child0.addChildAt(root_child0_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -100,7 +100,7 @@ public class YGSizeOverflowTest { assertEquals(200f, root_child0_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -133,7 +133,7 @@ public class YGSizeOverflowTest { root_child0_child0.setHeight(200f); root_child0.addChildAt(root_child0_child0, 0); root.setDirection(YogaDirection.LTR); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); @@ -151,7 +151,7 @@ public class YGSizeOverflowTest { assertEquals(200f, root_child0_child0.getLayoutHeight(), 0.0f); root.setDirection(YogaDirection.RTL); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0f, root.getLayoutX(), 0.0f); assertEquals(0f, root.getLayoutY(), 0.0f); diff --git a/java/tests/com/facebook/yoga/YogaNodeTest.java b/java/tests/com/facebook/yoga/YogaNodeTest.java index 9d72bb15..60953f2e 100644 --- a/java/tests/com/facebook/yoga/YogaNodeTest.java +++ b/java/tests/com/facebook/yoga/YogaNodeTest.java @@ -46,7 +46,7 @@ public class YogaNodeTest { }); root.addChildAt(child2, 1); - root.calculateLayout(); + root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(0, (int) child1.getLayoutY()); assertEquals(40, (int) child2.getLayoutY()); @@ -65,7 +65,7 @@ public class YogaNodeTest { return YogaMeasureOutput.make(100, 100); } }); - node.calculateLayout(); + node.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(100, (int) node.getLayoutWidth()); assertEquals(100, (int) node.getLayoutHeight()); } @@ -83,7 +83,7 @@ public class YogaNodeTest { return YogaMeasureOutput.make(100.5f, 100.5f); } }); - node.calculateLayout(); + node.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(100.5f, node.getLayoutWidth(), 0.0f); assertEquals(100.5f, node.getLayoutHeight(), 0.0f); } @@ -101,7 +101,7 @@ public class YogaNodeTest { return YogaMeasureOutput.make(Float.MIN_VALUE, Float.MIN_VALUE); } }); - node.calculateLayout(); + node.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(Float.MIN_VALUE, node.getLayoutWidth(), 0.0f); assertEquals(Float.MIN_VALUE, node.getLayoutHeight(), 0.0f); } @@ -119,7 +119,7 @@ public class YogaNodeTest { return YogaMeasureOutput.make(Float.MAX_VALUE, Float.MAX_VALUE); } }); - node.calculateLayout(); + node.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(Float.MAX_VALUE, node.getLayoutWidth(), 0.0f); assertEquals(Float.MAX_VALUE, node.getLayoutHeight(), 0.0f); } @@ -177,7 +177,7 @@ public class YogaNodeTest { node.setMargin(YogaEdge.END, 2); node.setMargin(YogaEdge.TOP, 3); node.setMargin(YogaEdge.BOTTOM, 4); - node.calculateLayout(); + node.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(1, (int) node.getLayoutMargin(YogaEdge.LEFT)); assertEquals(2, (int) node.getLayoutMargin(YogaEdge.RIGHT)); @@ -194,11 +194,23 @@ public class YogaNodeTest { node.setPadding(YogaEdge.END, 2); node.setPadding(YogaEdge.TOP, 3); node.setPadding(YogaEdge.BOTTOM, 4); - node.calculateLayout(); + node.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED); assertEquals(1, (int) node.getLayoutPadding(YogaEdge.LEFT)); assertEquals(2, (int) node.getLayoutPadding(YogaEdge.RIGHT)); assertEquals(3, (int) node.getLayoutPadding(YogaEdge.TOP)); assertEquals(4, (int) node.getLayoutPadding(YogaEdge.BOTTOM)); } + + @Test + public void testPercentPaddingOnRoot() { + final YogaNode node = new YogaNode(); + node.setPaddingPercent(YogaEdge.ALL, 10); + node.calculateLayout(50, 50); + + assertEquals(5, (int) node.getLayoutPadding(YogaEdge.LEFT)); + assertEquals(5, (int) node.getLayoutPadding(YogaEdge.RIGHT)); + assertEquals(5, (int) node.getLayoutPadding(YogaEdge.TOP)); + assertEquals(5, (int) node.getLayoutPadding(YogaEdge.BOTTOM)); + } }