diff --git a/apps/app/ui-tests-app/app.ts b/apps/app/ui-tests-app/app.ts index f06fff45eb..81b432f094 100644 --- a/apps/app/ui-tests-app/app.ts +++ b/apps/app/ui-tests-app/app.ts @@ -69,13 +69,10 @@ application.on(application.lowMemoryEvent, function (args: application.Applicati }); application.on(application.uncaughtErrorEvent, function (args: application.UnhandledErrorEventData) { - if (args.android) { - // For Android applications, args.android is NativeScriptError. - console.log("### NativeScriptError: " + args.android); - } else if (args.ios) { - // For iOS applications, args.ios is NativeScriptError. - console.log("### NativeScriptError: " + args.ios); - } + console.log("### NativeScriptError: " + args.error); + console.log("### nativeException: " + (args.error).nativeException); + console.log("### stackTace: " + (args.error).stackTrace); + console.log("### stack: " + args.error.stack); }); application.setCssFileName("ui-tests-app/app.css"); diff --git a/apps/app/ui-tests-app/mainPage.ts b/apps/app/ui-tests-app/mainPage.ts index e27ab75efc..296a51e2ee 100644 --- a/apps/app/ui-tests-app/mainPage.ts +++ b/apps/app/ui-tests-app/mainPage.ts @@ -15,9 +15,7 @@ var oldExamples: Map = new Map(); export function pageLoaded(args: EventData) { let page = args.object; - let view = require("ui/core/view"); - let wrapLayout = view.getViewById(page, "wrapLayoutWithExamples"); - + let wrapLayout = page.getViewById("wrapLayoutWithExamples"); examples.set("action-bar", "action-bar/main-page"); examples.set("bindings", "bindings/main-page"); examples.set("css", "css/main-page"); @@ -46,8 +44,8 @@ export function pageLoaded(args: EventData) { let viewModel = new MainPageViewModel(wrapLayout, examples); page.bindingContext = viewModel; - var parent = page.getViewById('parentLayout'); - var searchBar = page.getViewById('textView'); + var parent = page.getViewById('parentLayout'); + var searchBar = page.getViewById('textView'); if (parent.android) { parent.android.setFocusableInTouchMode(true); @@ -57,7 +55,7 @@ export function pageLoaded(args: EventData) { refresh(); } - + // should be removes export function refresh() { oldExamples.set("actStyle", "action-bar/all"); @@ -217,7 +215,7 @@ export class MainPageViewModel extends observable.Observable { } btn.style.color = new colorModule.Color(this.colors[count++ % 3]); - btn.on(buttonModule.Button.tapEvent, function(eventData) { + btn.on(buttonModule.Button.tapEvent, function (eventData) { let text = btn.text; this.loadExample(text); }, this); diff --git a/tests/app/TKUnit.ts b/tests/app/TKUnit.ts index 0f80de5d07..1da82183f0 100644 --- a/tests/app/TKUnit.ts +++ b/tests/app/TKUnit.ts @@ -366,13 +366,13 @@ export var wait = function (seconds: number) { }, seconds, false); }; -export var waitUntilReady = function (isReady: () => boolean, timeoutSec: number = 20, shouldThrow: boolean = true) { +export var waitUntilReady = function (isReady: () => boolean, timeoutSec: number = 3, shouldThrow: boolean = true) { if (!isReady) { return; } if (Application.ios) { - var waitTime = 20 / 1000; + const waitTime = 20 / 1000; var totalWaitTime = 0; while (true) { utils.ios.getter(NSRunLoop, NSRunLoop.currentRunLoop).runUntilDate(NSDate.dateWithTimeIntervalSinceNow(waitTime)); diff --git a/tests/app/testRunner.ts b/tests/app/testRunner.ts index 9912756cd8..4988877e4d 100644 --- a/tests/app/testRunner.ts +++ b/tests/app/testRunner.ts @@ -344,8 +344,12 @@ function printRunTestStats() { page.style.backgroundColor = unsetValue; page.content = stack; messageContainer.focus(); + page.style.fontSize = 11; if (page.android) { - setTimeout(() => messageContainer.dismissSoftInput()); + setTimeout(() => { + messageContainer.dismissSoftInput(); + (messageContainer.nativeView).scrollTo(0, 0); + }); } } diff --git a/tests/app/ui/action-bar/action-bar-tests.android.ts b/tests/app/ui/action-bar/action-bar-tests.android.ts index 6671592599..0f6a23bda6 100644 --- a/tests/app/ui/action-bar/action-bar-tests.android.ts +++ b/tests/app/ui/action-bar/action-bar-tests.android.ts @@ -11,7 +11,7 @@ export function test_actionItem_visibility() { actionItem.text = "Test"; const page = actionTestsCommon.createPageAndNavigate(); page.actionBar.actionItems.addItem(actionItem); - const toolbar = (page.actionBar)._toolbar; + const toolbar = page.actionBar.nativeView; const menu = toolbar.getMenu(); TKUnit.assertTrue(menu.hasVisibleItems(), "Visibility does not work"); @@ -25,7 +25,7 @@ export function test_navigationButton_visibility() { const page = actionTestsCommon.createPageAndNavigate(); page.actionBar.navigationButton = actionItem; - const toolbar = (page.actionBar)._toolbar; + const toolbar = page.actionBar.nativeView; TKUnit.assertNotNull(toolbar.getNavigationIcon(), "Visibility does not work"); actionItem.visibility = Visibility.collapse; @@ -72,4 +72,4 @@ export function test_add_actionItem_with_actionView_propagates_context() { TKUnit.assertNull(actionButton._context, "Action button context should be null before added"); actionItem.actionView = actionButton; TKUnit.assertNotNull(actionButton._context, "Action button context should not be null after add"); -} +} \ No newline at end of file diff --git a/tests/app/ui/core/bindable/bindable-tests.ts b/tests/app/ui/core/bindable/bindable-tests.ts index 7ebb0285e2..560a6b4cd3 100644 --- a/tests/app/ui/core/bindable/bindable-tests.ts +++ b/tests/app/ui/core/bindable/bindable-tests.ts @@ -604,7 +604,7 @@ export function test_BindingToDictionaryAtAppLevel() { pageViewModel.set("testProperty", testPropertyName); const dict = {}; dict[testPropertyName] = expectedValue; - appModule.resources["dict"] = dict; + appModule.getResources()["dict"] = dict; const testFunc = function (views: Array) { const testLabel =