diff --git a/apps/app/ui-tests-app/font/all-fonts.ts b/apps/app/ui-tests-app/font/all-fonts.ts index 3b4f97260..fd374dae6 100644 --- a/apps/app/ui-tests-app/font/all-fonts.ts +++ b/apps/app/ui-tests-app/font/all-fonts.ts @@ -6,7 +6,6 @@ import { Label } from "tns-core-modules/ui/label"; import { FontStyle, FontWeight } from "tns-core-modules/ui/enums"; import * as typeUtils from "tns-core-modules/utils/types"; import { Color } from "tns-core-modules/color"; -import * as utils from "tns-core-modules/utils/utils"; import { isIOS } from "tns-core-modules/platform"; const genericFontFamilies = [ @@ -48,7 +47,7 @@ let compareIgnoreCase = function (a, b) { }; if (isIOS) { - const nsFontFamilies = utils.ios.getter(UIFont, UIFont.familyNames); + const nsFontFamilies = UIFont.familyNames; for (let i = 0; i < nsFontFamilies.count; i++) { const family = nsFontFamilies.objectAtIndex(i); fontFamilies.push(family) diff --git a/tests/app/TKUnit.ts b/tests/app/TKUnit.ts index 72e4ea164..f5fda0c8f 100644 --- a/tests/app/TKUnit.ts +++ b/tests/app/TKUnit.ts @@ -15,9 +15,6 @@ import * as timer from "tns-core-modules/timer"; import * as trace from "tns-core-modules/trace"; import * as types from "tns-core-modules/utils/types"; import * as platform from "tns-core-modules/platform"; -import { topmost } from "tns-core-modules/ui/frame"; - -import * as utils from "tns-core-modules/utils/utils"; const sdkVersion = parseInt(platform.device.sdkVersion); @@ -371,7 +368,7 @@ export function waitUntilReady(isReady: () => boolean, timeoutSec: number = 3, s let totalWaitTime = 0; while (true) { const begin = time(); - const currentRunLoop = utils.ios.getter(NSRunLoop, NSRunLoop.currentRunLoop); + const currentRunLoop = NSRunLoop.currentRunLoop; currentRunLoop.limitDateForMode(currentRunLoop.currentMode); if (isReady()) { break; diff --git a/tests/app/application/application-tests.ios.ts b/tests/app/application/application-tests.ios.ts index 6be1a1073..b019da98f 100644 --- a/tests/app/application/application-tests.ios.ts +++ b/tests/app/application/application-tests.ios.ts @@ -1,11 +1,7 @@ /* tslint:disable:no-unused-variable */ import * as app from "tns-core-modules/application"; -import * as TKUnit from "../TKUnit"; import * as commonTests from "./application-tests-common"; -import * as utils from "tns-core-modules/utils/utils"; -import getter = utils.ios.getter; - global.moduleMerge(commonTests, exports); // >> application-ios-observer @@ -13,7 +9,7 @@ global.moduleMerge(commonTests, exports); if (app.ios) { var observer = app.ios.addNotificationObserver(UIDeviceBatteryLevelDidChangeNotification, function onReceiveCallback(notification: NSNotification) { - var percent = getter(UIDevice, UIDevice.currentDevice).batteryLevel * 100; + var percent = UIDevice.currentDevice.batteryLevel * 100; var message = "Battery: " + percent + "%"; ////console.log(message); }); diff --git a/tests/app/pages/page5.ts b/tests/app/pages/page5.ts index cd6f17640..b78b881b2 100644 --- a/tests/app/pages/page5.ts +++ b/tests/app/pages/page5.ts @@ -4,8 +4,6 @@ import * as buttons from "tns-core-modules/ui/button"; import * as app from "tns-core-modules/application"; import * as platform from "tns-core-modules/platform"; -import * as utils from "tns-core-modules/utils/utils"; - function printDeviceInfoAndroid() { console.log("android.os.Build.DEVICE = " + android.os.Build.DEVICE); //android.os.Build.DEVICE = hammerhead console.log("android.os.Build.VERSION.SDK = " + android.os.Build.VERSION.SDK); //android.os.Build.VERSION.SDK = 19 @@ -29,7 +27,7 @@ function printDeviceInfoAndroid() { } function printDeviceInfoIOS() { - var device = utils.ios.getter(UIDevice, UIDevice.currentDevice); + var device = UIDevice.currentDevice; console.log("device.name = " + device.name); //device.name = iPhone Simulator console.log("device.systemName = " + device.systemName); //device.systemName = iPhone OS console.log("device.systemVersion = " + device.systemVersion); //device.systemVersion = 8.1 @@ -37,7 +35,7 @@ function printDeviceInfoIOS() { console.log("device.localizedModel = " + device.localizedModel); //device.localizedModel = iPhone Simulator console.log("device.userInterfaceIdiom = " + device.userInterfaceIdiom); //device.userInterfaceIdiom = 0 console.log("device.batteryLevel = " + device.batteryLevel); //device.batteryLevel = -1 - var screen = utils.ios.getter(UIScreen, UIScreen.mainScreen); + var screen = UIScreen.mainScreen; console.log("screen = " + screen); console.log("screen.nativeBounds = " + screen.nativeBounds.size.width + ", " + screen.nativeBounds.size.height); //screen.nativeBounds = 640, 1136 console.log("screen.scale = " + screen.scale); //screen.scale = 2 diff --git a/tests/app/ui/date-picker/date-picker-tests-native.ios.ts b/tests/app/ui/date-picker/date-picker-tests-native.ios.ts index 9361d62ef..3a3231eac 100644 --- a/tests/app/ui/date-picker/date-picker-tests-native.ios.ts +++ b/tests/app/ui/date-picker/date-picker-tests-native.ios.ts @@ -1,17 +1,15 @@ import * as datePickerModule from "tns-core-modules/ui/date-picker"; -import * as utils from "tns-core-modules/utils/utils"; - export function getNativeYear(datePicker: datePickerModule.DatePicker): number { - return utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date).year; + return NSCalendar.currentCalendar.componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date).year; } export function getNativeMonth(datePicker: datePickerModule.DatePicker): number { - return utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date).month; + return NSCalendar.currentCalendar.componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date).month; } export function getNativeDay(datePicker: datePickerModule.DatePicker): number { - return utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date).day; + return NSCalendar.currentCalendar.componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date).day; } export function getNativeMaxDate(datePicker: datePickerModule.DatePicker): Date { @@ -23,31 +21,31 @@ export function getNativeMinDate(datePicker: datePickerModule.DatePicker): Date } export function setNativeYear(datePicker: datePickerModule.DatePicker, value: number): void { - var comps = utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date); + var comps = NSCalendar.currentCalendar.componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date); comps.year = value; - datePicker.ios.setDateAnimated(utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).dateFromComponents(comps), false); + datePicker.ios.setDateAnimated(NSCalendar.currentCalendar.dateFromComponents(comps), false); (datePicker)._changeHandler.valueChanged(datePicker.ios); } export function setNativeMonth(datePicker: datePickerModule.DatePicker, value: number): void { - var comps = utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date); + var comps = NSCalendar.currentCalendar.componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date); comps.month = value; - datePicker.ios.setDateAnimated(utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).dateFromComponents(comps), false); + datePicker.ios.setDateAnimated(NSCalendar.currentCalendar.dateFromComponents(comps), false); (datePicker)._changeHandler.valueChanged(datePicker.ios); } export function setNativeDay(datePicker: datePickerModule.DatePicker, value: number): void { - var comps = utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date); + var comps = NSCalendar.currentCalendar.componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date); comps.day = value; - datePicker.ios.setDateAnimated(utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).dateFromComponents(comps), false); + datePicker.ios.setDateAnimated(NSCalendar.currentCalendar.dateFromComponents(comps), false); (datePicker)._changeHandler.valueChanged(datePicker.ios); } export function setNativeDate(datePicker: datePickerModule.DatePicker, year: number, month: number, day: number): void { - var comps = utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date); + var comps = NSCalendar.currentCalendar.componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date); comps.year = year; comps.month = month; comps.day = day; - datePicker.ios.setDateAnimated(utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).dateFromComponents(comps), false); + datePicker.ios.setDateAnimated(NSCalendar.currentCalendar.dateFromComponents(comps), false); (datePicker)._changeHandler.valueChanged(datePicker.ios); } diff --git a/tests/app/ui/helper.ts b/tests/app/ui/helper.ts index 74bc6dd4a..6ccd5b490 100644 --- a/tests/app/ui/helper.ts +++ b/tests/app/ui/helper.ts @@ -10,7 +10,6 @@ import { ActionBar } from "tns-core-modules/ui/action-bar"; import { Color } from "tns-core-modules/color"; import { LayoutBase } from "tns-core-modules/ui/layouts/layout-base"; -import { FlexboxLayout } from "tns-core-modules/ui/layouts/flexbox-layout"; import { FormattedString, Span } from "tns-core-modules/text/formatted-string"; import { _getProperties, _getStyleProperties } from "tns-core-modules/ui/core/properties"; import { device } from "tns-core-modules/platform"; @@ -305,11 +304,11 @@ export function _generateFormattedString(): FormattedString { return formattedString; } -const props = _getProperties(); -const styleProps = _getStyleProperties(); -let setters: Map; -let cssSetters: Map; -let defaultNativeGetters: Map any>; +// const props = _getProperties(); +// const styleProps = _getStyleProperties(); +// let setters: Map; +// let cssSetters: Map; +// let defaultNativeGetters: Map any>; export function nativeView_recycling_test(createNew: () => View, createLayout?: () => LayoutBase, nativeGetters?: Map any>, customSetters?: Map) { return; @@ -373,490 +372,490 @@ export function nativeView_recycling_test(createNew: () => View, createLayout?: // layout.removeChild(first); } -function compareUsingReflection(recycledNativeView: View, newNativeView: View): void { - const recycled: android.view.View = recycledNativeView.nativeViewProtected; - const newer: android.view.View = newNativeView.nativeViewProtected; - TKUnit.assertNotEqual(recycled, newer); - const methods = newer.getClass().getMethods(); - for (let i = 0, length = methods.length; i < length; i++) { - const method = methods[i]; - const returnType = method.getReturnType(); - const name = method.getName(); - const skip = name.includes("ViewId") - || name.includes("Accessibility") - || name.includes("hashCode") - || name === "getId" - || name === "hasFocus" - || name === "isDirty" - || name === "getLeft" - || name === "getTop" - || name === "getRight" - || name === "getBottom" - || name === "getWidth" - || name === "getHeight" - || name === "getX" - || name === "getY" - || name.includes("getMeasured") - || name === "toString"; - - if (skip || method.getParameterTypes().length > 0) { - continue; - } - - if ((java).lang.Comparable.class.isAssignableFrom(returnType)) { - const defValue = method.invoke(newer, null); - const currValue = method.invoke(recycled, null); - if (defValue !== currValue && defValue.compareTo(currValue) !== 0) { - throw new Error(`Actual: ${currValue}, Expected: ${defValue}, for method: ${method.getName()}`); - } - } else if (java.lang.String.class === returnType || - java.lang.Character.class === returnType || - (java).lang.CharSequence.class === returnType || - returnType === java.lang.Byte.TYPE || - returnType === java.lang.Double.TYPE || - returnType === java.lang.Float.TYPE || - returnType === java.lang.Integer.TYPE || - returnType === java.lang.Long.TYPE || - returnType === java.lang.Short.TYPE || - returnType === java.lang.Boolean.TYPE) { - - const defValue = method.invoke(newer, null); - const currValue = method.invoke(recycled, null); - if ((currValue + "") !== (defValue + "")) { - throw new Error(`Actual: ${currValue}, Expected: ${defValue}, for method: ${method.getName()}`); - } - } - } -} - -function checkDefaults(newer: View, first: View, props: Array, nativeGetters: Map any>): void { - props.forEach(prop => { - const name = (prop).name; - if (nativeGetters.has(name)) { - const getter = nativeGetters.get(name); - TKUnit.assertDeepEqual(getter(newer), getter(first), name); - } else if (newer[prop.getDefault]) { - TKUnit.assertDeepEqual(newer[prop.getDefault](), first[prop.getDefault](), name); - } else if (newer[prop.setNative]) { - console.log(`Type: ${newer.typeName} has no getter for ${name} property.`) - } - }); -} - -function setValue(object: Object, setters: Map, customSetters?: Map): void { - setters.forEach((value1, key) => { - let value = customSetters && customSetters.has(key) ? customSetters.get(key) : value1; - const currentValue = object[key]; - if (currentValue === value) { - if (value === "horizontal" && key === "orientation") { - // wrap-layout.orientation default value is 'horizontal' - value = "vertical"; - } else if (value === 2) { - value = 3; - } - } - - object[key] = value; - const newValue = object[key]; - TKUnit.assertNotEqual(newValue, currentValue, `${object} setting ${key} should change current value.`); - }); -} - -function setupSetters(): void { - if (setters) { - return; - } - - setters = new Map(); - // view-base - setters.set("id", "someId"); - setters.set("className", "someClassName"); - setters.set("bindingContext", "someBindingContext"); - - // view - setters.set("automationText", "automationText"); - setters.set("originX", 0.2); - setters.set("originY", 0.2); - setters.set("isEnabled", false); - setters.set("isUserInteractionEnabled", false); - - // action-bar - setters.set("title", "title"); - setters.set("text", "text"); - setters.set("icon", "~/logo.png"); - setters.set("visibility", "collapse"); - - // activity-indicator - setters.set("busy", true); - - // date-picker - setters.set("year", "2010"); - setters.set("month", "2"); - setters.set("day", "2"); - setters.set("maxDate", "2100"); - setters.set("minDate", "2000"); - setters.set("date", new Date(2011, 3, 3)); - - // editable-text - setters.set("keyboardType", "datetime"); - setters.set("returnKeyType", "done"); - setters.set("editable", false); - setters.set("updateTextTrigger", "focusLost"); - setters.set("autocapitalizationType", "words"); - setters.set("autocorrect", true); - setters.set("hint", "hint"); - setters.set("maxLength", "10"); - - // html-view - setters.set("html", ""); - - // image-view - setters.set("imageSource", ""); - setters.set("src", ""); - setters.set("loadMode", "async"); - setters.set("isLoading", true); - setters.set("stretch", "none"); - - // layout-base - setters.set("clipToBounds", false); - - // absolute-layout - setters.set("left", "20"); - setters.set("top", "20"); - - // dock-layout - setters.set("dock", "top"); - setters.set("stretchLastChild", false); - - // grid-layout props - setters.set("row", "1"); - setters.set("rowSpan", "2"); - setters.set("col", "1"); - setters.set("colSpan", "2"); - - // stack-layout - setters.set("orientation", "horizontal"); - - // wrap-layout - // custom orientation value - // setters.set('orientation', 'vertical'); - setters.set("itemWidth", "50"); - setters.set("itemHeight", "50"); - - // list-picker - setters.set("items", ["1", "2", "3"]); - setters.set("selectedIndex", "1"); - - // list-view - setters.set("items", ["1", "2", "3"]); - setters.set("itemTemplate", "