From 773e069681f61f785b75f8466d72400947ab8036 Mon Sep 17 00:00:00 2001 From: Panayot Cankov Date: Thu, 29 Dec 2016 11:46:04 +0200 Subject: [PATCH] Run all stack-layout tests --- tests/app/testRunner.ts | 2 +- tests/app/ui/layouts/stack-layout-tests.ts | 2 +- tns-core-modules/ui/core/view-common.ts | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/app/testRunner.ts b/tests/app/testRunner.ts index e55c0fbba..ff145e850 100644 --- a/tests/app/testRunner.ts +++ b/tests/app/testRunner.ts @@ -61,7 +61,7 @@ allTests["SCROLL-VIEW"] = require("./ui/scroll-view/scroll-view-tests"); // allTests["WRAPLAYOUT"] = require("./ui/layouts/wrap-layout-tests"); // allTests["ABSOLUTELAYOUT"] = require("./ui/layouts/absolute-layout-tests"); // allTests["GRIDLAYOUT"] = require("./ui/layouts/grid-layout-tests"); -// allTests["STACKLAYOUT"] = require("./ui/layouts/stack-layout-tests"); +allTests["STACKLAYOUT"] = require("./ui/layouts/stack-layout-tests"); // allTests["FLEXBOXLAYOUT"] = require("./ui/layouts/flexbox-layout-tests"); // allTests["STYLE-PROPERTIES"] = require("./ui/styling/style-properties-tests"); // allTests["FRAME"] = require("./ui/frame/frame-tests"); diff --git a/tests/app/ui/layouts/stack-layout-tests.ts b/tests/app/ui/layouts/stack-layout-tests.ts index 3ad2c2429..9396fba81 100644 --- a/tests/app/ui/layouts/stack-layout-tests.ts +++ b/tests/app/ui/layouts/stack-layout-tests.ts @@ -136,7 +136,7 @@ export class StackLayoutTest extends testModule.UITest { private assertChildTexts(expected, layout, message) { let texts: Array = []; - layout._eachChildView((child: { text: string }) => texts.push(child.text)); + layout.eachChildView((child: { text: string }) => texts.push(child.text)); TKUnit.assertEqual(expected, texts.join('|'), message); } diff --git a/tns-core-modules/ui/core/view-common.ts b/tns-core-modules/ui/core/view-common.ts index 9a97b6dd6..81e1b83b8 100644 --- a/tns-core-modules/ui/core/view-common.ts +++ b/tns-core-modules/ui/core/view-common.ts @@ -1336,10 +1336,10 @@ function parseThickness(value: string): Thickness { function convertToMargins(this: void, value: string): [CssProperty, any][] { let thickness = parseThickness(value); return [ - [marginTopProperty, Length.parse(thickness.top)], - [marginRightProperty, Length.parse(thickness.right)], - [marginBottomProperty, Length.parse(thickness.bottom)], - [marginLeftProperty, Length.parse(thickness.left)] + [marginTopProperty, PercentLength.parse(thickness.top)], + [marginRightProperty, PercentLength.parse(thickness.right)], + [marginBottomProperty, PercentLength.parse(thickness.bottom)], + [marginLeftProperty, PercentLength.parse(thickness.left)] ]; }