diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj index 0da87ed5b..165dce381 100644 --- a/CrossPlatformModules.csproj +++ b/CrossPlatformModules.csproj @@ -151,9 +151,6 @@ - - - time-picker-tests-native.d.ts diff --git a/apps/tests/ui/border/border-tests-native.android.ts b/apps/tests/ui/border/border-tests-native.android.ts deleted file mode 100644 index 0d9ad838d..000000000 --- a/apps/tests/ui/border/border-tests-native.android.ts +++ /dev/null @@ -1,31 +0,0 @@ -import borderModule = require("ui/border"); - -export function getNativeBorderWidth(border: borderModule.Border): number { - var bkg = (border.android).getBackground(); - - return bkg ? bkg.borderWidth : -1; -} - -export function getNativeCornerRadius(border: borderModule.Border): number { - var bkg = (border.android).getBackground(); - - return bkg ? bkg.cornerRadius : -1; -} - -export function checkNativeBorderColor(border: borderModule.Border): boolean { - var bkg = (border.android).getBackground(); - - return border.borderColor && bkg && bkg.borderColor === border.borderColor.android; -} - -export function checkNativeBackgroundColor(border: borderModule.Border): boolean { - var bkg = (border.android).getBackground(); - - return border.backgroundColor && bkg && bkg.backgroundColor === border.backgroundColor.android; -} - -export function checkNativeBackgroundImage(border: borderModule.Border): boolean { - var bkg = (border.android).getBackground(); - - return bkg && bkg.bitmap !== undefined; -} \ No newline at end of file diff --git a/apps/tests/ui/border/border-tests-native.d.ts b/apps/tests/ui/border/border-tests-native.d.ts deleted file mode 100644 index 867230193..000000000 --- a/apps/tests/ui/border/border-tests-native.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -//@private -import borderModule = require("ui/border"); - -export declare function getNativeBorderWidth(border: borderModule.Border): number; - -export declare function getNativeCornerRadius(border: borderModule.Border): number; - -export declare function checkNativeBorderColor(border: borderModule.Border): boolean - -export declare function checkNativeBackgroundColor(border: borderModule.Border): boolean; - -export declare function checkNativeBackgroundImage(border: borderModule.Border): boolean \ No newline at end of file diff --git a/apps/tests/ui/border/border-tests-native.ios.ts b/apps/tests/ui/border/border-tests-native.ios.ts deleted file mode 100644 index ecd54ae0c..000000000 --- a/apps/tests/ui/border/border-tests-native.ios.ts +++ /dev/null @@ -1,21 +0,0 @@ -import borderModule = require("ui/border"); - -export function getNativeBorderWidth(border: borderModule.Border): number { - return (border.ios).layer.borderWidth; -} - -export function getNativeCornerRadius(border: borderModule.Border): number { - return (border.ios).layer.cornerRadius; -} - -export function checkNativeBorderColor(border: borderModule.Border): boolean { - return border.borderColor && (border.ios).layer.borderColor === border.borderColor.ios.CGColor; -} - -export function checkNativeBackgroundColor(border: borderModule.Border): boolean { - return border.backgroundColor && (border.ios).backgroundColor.isEqual(border.backgroundColor.ios); -} - -export function checkNativeBackgroundImage(border: borderModule.Border): boolean { - return (border.ios).backgroundColor !== undefined; -} \ No newline at end of file diff --git a/apps/tests/ui/border/border-tests.ts b/apps/tests/ui/border/border-tests.ts index 4e35ea430..7109c187f 100644 --- a/apps/tests/ui/border/border-tests.ts +++ b/apps/tests/ui/border/border-tests.ts @@ -22,66 +22,3 @@ import borderModule = require("ui/border"); // //``` //  - -function _createBorder(): borderModule.Border { - // - // ### Creating a Border programmatically - // ``` JavaScript - var button = new buttonModule.Button(); - button.text = "OK"; - - var border = new borderModule.Border(); - border.cornerRadius = 10; - border.borderWidth = 2; - border.borderColor = new colorModule.Color("#FF0000"); - border.backgroundColor = new colorModule.Color("#FFFF00"); - - border.content = button; - // ``` - // - - return border; -} - -export var testBorderWidth = function () { - helper.buildUIAndRunTest(_createBorder(), function (views: Array) { - var border = views[0]; - var expectedValue = border.borderWidth; - var actualValue = borderTestsNative.getNativeBorderWidth(border); - TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue); - }); -} - -export var testCornerRadius = function () { - helper.buildUIAndRunTest(_createBorder(), function (views: Array) { - var border = views[0]; - var expectedValue = border.cornerRadius; - var actualValue = borderTestsNative.getNativeCornerRadius(border); - TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue); - }); -} - -export var testBorderColor = function () { - helper.buildUIAndRunTest(_createBorder(), function (views: Array) { - var border = views[0]; - TKUnit.assert(borderTestsNative.checkNativeBorderColor(border), "BorderColor not applied correctly!"); - }); -} - -export var testBackgroundColor = function () { - helper.buildUIAndRunTest(_createBorder(), function (views: Array) { - var border = views[0]; - TKUnit.assert(borderTestsNative.checkNativeBackgroundColor(border), "BackgroundColor not applied correctly!"); - }); -} - -export var testBackgroundImage = function () { - var border = _createBorder(); - - helper.buildUIAndRunTest(border, function (views: Array) { - var page = views[1]; - page.css = "Border { background-image: url('~/logo.png') }"; - - TKUnit.assert(borderTestsNative.checkNativeBackgroundImage(border), "Style background-image not loaded correctly."); - }); -} \ No newline at end of file