From 32c2ad1e6dd0db7ed4c7f0ba6cdf6566fe0316f6 Mon Sep 17 00:00:00 2001 From: vakrilov Date: Mon, 6 Jul 2015 17:02:07 +0300 Subject: [PATCH] Fixed more tests --- apps/tests/ui/view/view-tests.android.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/tests/ui/view/view-tests.android.ts b/apps/tests/ui/view/view-tests.android.ts index c4bdbe121..396b1d31a 100644 --- a/apps/tests/ui/view/view-tests.android.ts +++ b/apps/tests/ui/view/view-tests.android.ts @@ -6,6 +6,7 @@ import button = require("ui/button"); import types = require("utils/types"); import stack = require("ui/layouts/stack-layout"); import labelModule = require("ui/label"); +import background = require("ui/styling/background"); import trace = require("trace"); // enable the trace, it is disabled by default @@ -268,19 +269,19 @@ export function getNativeCornerRadius(v: view.View): number { } export function checkNativeBorderColor(v: view.View): boolean { - var bkg = (v.android).getBackground(); + var bkg = (v.android).getBackground(); return v.borderColor && bkg && bkg.borderColor === v.borderColor.android; } export function checkNativeBackgroundColor(v: view.View): boolean { - var bkg = (v.android).getBackground(); + var bkg = (v.android).getBackground(); - return v.backgroundColor && bkg && bkg.backgroundColor === v.backgroundColor.android; + return v.backgroundColor && bkg && bkg.background && bkg.background.color.equals(v.backgroundColor); } export function checkNativeBackgroundImage(v: view.View): boolean { - var bkg = (v.android).getBackground(); + var bkg = (v.android).getBackground(); - return bkg && bkg.bitmap !== undefined; + return bkg && bkg.background && !types.isNullOrUndefined(bkg.background.image); } \ No newline at end of file