javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

border and tests fixes

Browse Source
This commit is contained in:
Vladimir Enchev
2015-06-08 15:29:25 +03:00
parent 0a5f28ca77
commit c878d94be2
5 changed files with 98 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/tests/ui/border/border-tests-native.android.ts
View File

@@ -1,34 +1,31 @@
import borderModule = require("ui/border");
import utils = require("utils/utils");
var density = utils.layout.getDisplayDensity();
export function getNativeBorderWidth(border: borderModule.Border): number {
var bkg = <any>(<android.view.ViewGroup>border.android).getBackground();
var bkg = <any>(<android.view.View>border.android).getBackground();
return bkg && bkg.getStroke ? bkg.getStroke() / density : -1;
return bkg ? bkg.borderWidth : -1;
}
export function getNativeCornerRadius(border: borderModule.Border): number {
var bkg = <any>(<android.view.ViewGroup>border.android).getBackground();
var bkg = <any>(<android.view.View>border.android).getBackground();
return bkg && bkg.getCornerRadius ? bkg.getCornerRadius() / density : -1;
return bkg ? bkg.cornerRadius : -1;
}
export function checkNativeBorderColor(border: borderModule.Border): boolean {
var bkg = <any>(<android.view.ViewGroup>border.android).getBackground();
var bkg = <any>(<android.view.View>border.android).getBackground();
return border.borderColor && bkg && bkg.getBorderColor && bkg.getBorderColor() === border.borderColor.android;
return border.borderColor && bkg && bkg.borderColor === border.borderColor.android;
}
export function checkNativeBackgroundColor(border: borderModule.Border): boolean {
var bkg = <any>(<android.view.ViewGroup>border.android).getBackground();
var bkg = <any>(<android.view.View>border.android).getBackground();
return border.backgroundColor && bkg && bkg.getBackgroundColor && bkg.getBackgroundColor() === border.backgroundColor.android;
return border.backgroundColor && bkg && bkg.backgroundColor === border.backgroundColor.android;
}
export function checkNativeBackgroundImage(border: borderModule.Border): boolean {
var bkg = <any>(<android.view.ViewGroup>border.android).getBackground();
var bkg = <any>(<android.view.View>border.android).getBackground();
return bkg && bkg.getBitmap && bkg.getBitmap() !== undefined;
return bkg && bkg.bitmap !== undefined;
}

4
apps/tests/ui/border/border-tests.ts
View File

@@ -80,8 +80,8 @@ export var testBackgroundImage = function () {
helper.buildUIAndRunTest(border, function (views: Array<viewModule.View>) {
var page = <pageModule.Page>views[1];
page.css = "Border { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC;') }";
page.css = "Border { background-image: url('http://www.google.com/images/errors/logo_sm_2.png') }";
TKUnit.assert(borderTestsNative.checkNativeBackgroundImage(border), "Style background-image not loaded correctly from data URI.");
TKUnit.assert(borderTestsNative.checkNativeBackgroundImage(border), "Style background-image not loaded correctly.");
});
}