From 2e46932fa90f4a57df5ea7d8d4558bd0112db6a8 Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Wed, 18 May 2016 17:15:55 +0300 Subject: [PATCH] Commented failing test for API 17 on x86 only (#2137) --- apps/tests/ui/page/page-tests-common.ts | 158 +++++++++++++----------- 1 file changed, 83 insertions(+), 75 deletions(-) diff --git a/apps/tests/ui/page/page-tests-common.ts b/apps/tests/ui/page/page-tests-common.ts index 97981f23b..01f0b086b 100644 --- a/apps/tests/ui/page/page-tests-common.ts +++ b/apps/tests/ui/page/page-tests-common.ts @@ -6,7 +6,7 @@ import frameModule = require("ui/frame"); // >> article-set-bindingcontext function pageLoaded(args) { - var page = args.object; + let page = args.object; page.bindingContext = { name : "Some name" }; } exports.pageLoaded = pageLoaded; @@ -20,26 +20,26 @@ import observable = require("data/observable"); import {Page, ShownModallyData, NavigatedData} from "ui/page"; import {Label} from "ui/label"; import {EventData} from "data/observable"; +import platform = require("platform"); export function addLabelToPage(page: Page, text?: string) { - var label = new Label(); + let label = new Label(); label.text = text || "The quick brown fox jumps over the lazy dog."; page.content = label; } export function test_AfterPageLoaded_is_called_NativeInstance_is_created() { + let page: Page; + let label: Label; + let nativeInstanceCreated = false; - var page: Page; - var label: Label; - var nativeInstanceCreated = false; - - var handler = function (data) { + let handler = function (data) { if (label.ios || label.android) { nativeInstanceCreated = true; } } - var pageFactory = function (): Page { + let pageFactory = function (): Page { page = new Page(); page.on(view.View.loadedEvent, handler); @@ -57,15 +57,15 @@ export function test_AfterPageLoaded_is_called_NativeInstance_is_created() { export function test_PageLoaded_is_called_once() { - var page1: Page; - var page2: Page; + let page1: Page; + let page2: Page; - var loaded = 0; - var handler = function (data) { + let loaded = 0; + let handler = function (data) { loaded++; } - var pageFactory = function (): Page { + let pageFactory = function (): Page { page1 = new Page(); addLabelToPage(page1, "Page 1"); return page1; @@ -74,7 +74,7 @@ export function test_PageLoaded_is_called_once() { helper.navigate(pageFactory); TKUnit.assertEqual(loaded, 0); - var pageFactory2 = function (): Page { + let pageFactory2 = function (): Page { page2 = new Page(); addLabelToPage(page2, "Page 2"); page2.on(view.View.loadedEvent, handler); @@ -89,20 +89,20 @@ export function test_PageLoaded_is_called_once() { export function test_NavigateToNewPage() { // >> artivle-create-navigate-to-page - var currentPage; - var topFrame = frameModule.topmost(); + let currentPage; + let topFrame = frameModule.topmost(); currentPage = topFrame.currentPage; - - var testPage: Page; - var pageFactory = function (): Page { + let testPage: Page; + let pageFactory = function (): Page { testPage = new pageModule.Page(); let label = new labelModule.Label(); label.text = "The quick brown fox jumps over the lazy dog."; testPage.content = label; return testPage; }; - var navEntry = { + + let navEntry = { create: pageFactory, animated: false }; @@ -132,10 +132,10 @@ export function test_PageNavigation_EventSequence_WithoutTransition() { } function _test_PageNavigation_EventSequence(withTransition: boolean) { - var testPage: Page; - var context = { property: "this is the context" }; - var eventSequence = []; - var pageFactory = function () { + let testPage: Page; + let context = { property: "this is the context" }; + let eventSequence = []; + let pageFactory = function () { testPage = new Page(); addLabelToPage(testPage); @@ -174,11 +174,11 @@ function _test_PageNavigation_EventSequence(withTransition: boolean) { let currentPage = frameModule.topmost().currentPage; if (withTransition) { - var navigationTransition: frameModule.NavigationTransition = { + let navigationTransition: frameModule.NavigationTransition = { name: "slide", duration: 100, }; - var navigationEntry: frameModule.NavigationEntry = { + let navigationEntry: frameModule.NavigationEntry = { create: pageFactory, context: context, animated: true, @@ -187,7 +187,7 @@ function _test_PageNavigation_EventSequence(withTransition: boolean) { frameModule.topmost().navigate(navigationEntry); } else { - var navigationEntry: frameModule.NavigationEntry = { + let navigationEntry: frameModule.NavigationEntry = { create: pageFactory, context: context, } @@ -199,22 +199,22 @@ function _test_PageNavigation_EventSequence(withTransition: boolean) { frameModule.goBack(); TKUnit.waitUntilReady(() => frameModule.topmost().currentPage !== null && frameModule.topmost().currentPage === currentPage); - var expectedEventSequence = ["navigatingTo", "loaded", "navigatedTo", "navigatingFrom", "unloaded", "navigatedFrom"]; + let expectedEventSequence = ["navigatingTo", "loaded", "navigatedTo", "navigatingFrom", "unloaded", "navigatedFrom"]; TKUnit.arrayAssert(eventSequence, expectedEventSequence, "Actual event sequence is not equal to expected. Actual: " + eventSequence + "; Expected: " + expectedEventSequence); } export function test_NavigateTo_WithContext() { let currentPage = frameModule.topmost().currentPage; // >> article-pass-data - var testPage: pageModule.Page; - var pageFactory = function (): pageModule.Page { + let testPage: pageModule.Page; + let pageFactory = function (): pageModule.Page { testPage = new pageModule.Page(); testPage.on(pageModule.Page.navigatedToEvent, function () { //console.log(JSON.stringify(context)); }); return testPage; }; - var navEntry = { + let navEntry = { create: pageFactory, context: "myContext", animated: false @@ -224,7 +224,7 @@ export function test_NavigateTo_WithContext() { // << article-pass-data TKUnit.waitUntilReady(() => topFrame.currentPage !== null && topFrame.currentPage !== currentPage && testPage.isLayoutValid); - var actualContextValue = testPage.navigationContext; + let actualContextValue = testPage.navigationContext; TKUnit.assertEqual(actualContextValue, "myContext"); topFrame.goBack(); @@ -234,8 +234,8 @@ export function test_NavigateTo_WithContext() { } export function test_FrameBackStack_WhenNavigatingForwardAndBack() { - var testPage: Page; - var pageFactory = function () { + let testPage: Page; + let pageFactory = function () { testPage = new Page(); addLabelToPage(testPage); return testPage; @@ -271,7 +271,7 @@ export function test_LoadPageFromDeclarativeWithCSS() { helper.navigateToModule("ui/page/test-page-declarative-css"); TKUnit.assert(topFrame.currentPage.content instanceof Label, "Content of the test page should be a Label created within test-page-module-css."); - var testLabel =