From a6bdf6abf12f8a8dce93a21c565fa5e96462f7bf Mon Sep 17 00:00:00 2001 From: Lukas Woehrl Date: Mon, 19 Dec 2016 19:35:29 +0100 Subject: [PATCH] fix more tests calls --- tests/YGMeasureCacheTest.cpp | 4 ++-- tests/YGMeasureModeTest.cpp | 36 ++++++++++++++++++------------------ tests/YGMeasureTest.cpp | 4 ++-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tests/YGMeasureCacheTest.cpp b/tests/YGMeasureCacheTest.cpp index ca932b25..65b043c3 100644 --- a/tests/YGMeasureCacheTest.cpp +++ b/tests/YGMeasureCacheTest.cpp @@ -43,8 +43,8 @@ TEST(YogaTest, measure_once_single_flexible_child) { const YGNodeRef root = YGNodeNew(); YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow); YGNodeStyleSetAlignItems(root, YGAlignFlexStart); - YGNodeStyleSetWidth(root, 100); - YGNodeStyleSetHeight(root, 100); + YGNodeStyleSetWidth(root, YGPx(100)); + YGNodeStyleSetHeight(root, YGPx(100)); const YGNodeRef root_child0 = YGNodeNew(); int measureCount = 0; diff --git a/tests/YGMeasureModeTest.cpp b/tests/YGMeasureModeTest.cpp index cd5aedba..ad766043 100644 --- a/tests/YGMeasureModeTest.cpp +++ b/tests/YGMeasureModeTest.cpp @@ -49,8 +49,8 @@ TEST(YogaTest, exactly_measure_stretched_child_column) { }; const YGNodeRef root = YGNodeNew(); - YGNodeStyleSetWidth(root, 100); - YGNodeStyleSetHeight(root, 100); + YGNodeStyleSetWidth(root, YGPx(100)); + YGNodeStyleSetHeight(root, YGPx(100)); const YGNodeRef root_child0 = YGNodeNew(); YGNodeSetContext(root_child0, &constraintList); @@ -76,8 +76,8 @@ TEST(YogaTest, exactly_measure_stretched_child_row) { const YGNodeRef root = YGNodeNew(); YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow); - YGNodeStyleSetWidth(root, 100); - YGNodeStyleSetHeight(root, 100); + YGNodeStyleSetWidth(root, YGPx(100)); + YGNodeStyleSetHeight(root, YGPx(100)); const YGNodeRef root_child0 = YGNodeNew(); YGNodeSetContext(root_child0, &constraintList); @@ -102,8 +102,8 @@ TEST(YogaTest, at_most_main_axis_column) { }; const YGNodeRef root = YGNodeNew(); - YGNodeStyleSetWidth(root, 100); - YGNodeStyleSetHeight(root, 100); + YGNodeStyleSetWidth(root, YGPx(100)); + YGNodeStyleSetHeight(root, YGPx(100)); const YGNodeRef root_child0 = YGNodeNew(); YGNodeSetContext(root_child0, &constraintList); @@ -129,8 +129,8 @@ TEST(YogaTest, at_most_cross_axis_column) { const YGNodeRef root = YGNodeNew(); YGNodeStyleSetAlignItems(root, YGAlignFlexStart); - YGNodeStyleSetWidth(root, 100); - YGNodeStyleSetHeight(root, 100); + YGNodeStyleSetWidth(root, YGPx(100)); + YGNodeStyleSetHeight(root, YGPx(100)); const YGNodeRef root_child0 = YGNodeNew(); YGNodeSetContext(root_child0, &constraintList); @@ -156,8 +156,8 @@ TEST(YogaTest, at_most_main_axis_row) { const YGNodeRef root = YGNodeNew(); YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow); - YGNodeStyleSetWidth(root, 100); - YGNodeStyleSetHeight(root, 100); + YGNodeStyleSetWidth(root, YGPx(100)); + YGNodeStyleSetHeight(root, YGPx(100)); const YGNodeRef root_child0 = YGNodeNew(); YGNodeSetContext(root_child0, &constraintList); @@ -184,8 +184,8 @@ TEST(YogaTest, at_most_cross_axis_row) { const YGNodeRef root = YGNodeNew(); YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow); YGNodeStyleSetAlignItems(root, YGAlignFlexStart); - YGNodeStyleSetWidth(root, 100); - YGNodeStyleSetHeight(root, 100); + YGNodeStyleSetWidth(root, YGPx(100)); + YGNodeStyleSetHeight(root, YGPx(100)); const YGNodeRef root_child0 = YGNodeNew(); YGNodeSetContext(root_child0, &constraintList); @@ -210,7 +210,7 @@ TEST(YogaTest, flex_child) { }; const YGNodeRef root = YGNodeNew(); - YGNodeStyleSetHeight(root, 100); + YGNodeStyleSetHeight(root, YGPx(100)); const YGNodeRef root_child0 = YGNodeNew(); YGNodeStyleSetFlexGrow(root_child0, 1); @@ -239,7 +239,7 @@ TEST(YogaTest, flex_child_with_flex_basis) { }; const YGNodeRef root = YGNodeNew(); - YGNodeStyleSetHeight(root, 100); + YGNodeStyleSetHeight(root, YGPx(100)); const YGNodeRef root_child0 = YGNodeNew(); YGNodeStyleSetFlexGrow(root_child0, 1); @@ -268,8 +268,8 @@ TEST(YogaTest, overflow_scroll_column) { const YGNodeRef root = YGNodeNew(); YGNodeStyleSetAlignItems(root, YGAlignFlexStart); YGNodeStyleSetOverflow(root, YGOverflowScroll); - YGNodeStyleSetHeight(root, 100); - YGNodeStyleSetWidth(root, 100); + YGNodeStyleSetHeight(root, YGPx(100)); + YGNodeStyleSetWidth(root, YGPx(100)); const YGNodeRef root_child0 = YGNodeNew(); YGNodeSetContext(root_child0, &constraintList); @@ -300,8 +300,8 @@ TEST(YogaTest, overflow_scroll_row) { YGNodeStyleSetAlignItems(root, YGAlignFlexStart); YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow); YGNodeStyleSetOverflow(root, YGOverflowScroll); - YGNodeStyleSetHeight(root, 100); - YGNodeStyleSetWidth(root, 100); + YGNodeStyleSetHeight(root, YGPx(100)); + YGNodeStyleSetWidth(root, YGPx(100)); const YGNodeRef root_child0 = YGNodeNew(); YGNodeSetContext(root_child0, &constraintList); diff --git a/tests/YGMeasureTest.cpp b/tests/YGMeasureTest.cpp index 911f0c51..b7eb6585 100644 --- a/tests/YGMeasureTest.cpp +++ b/tests/YGMeasureTest.cpp @@ -28,8 +28,8 @@ static YGSize _measure(YGNodeRef node, TEST(YogaTest, dont_measure_single_grow_shrink_child) { const YGNodeRef root = YGNodeNew(); - YGNodeStyleSetWidth(root, 100); - YGNodeStyleSetHeight(root, 100); + YGNodeStyleSetWidth(root, YGPx(100)); + YGNodeStyleSetHeight(root, YGPx(100)); int measureCount = 0;