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

Fix tslint errors.

Browse Source
This commit is contained in:
Hristo Deshev
2016-02-23 16:53:47 +02:00
parent c3331c0efd
commit de6a92f8c6
81 changed files with 266 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/perf-tests/NavigationTest/app.ts
View File

@@ -1,8 +1,6 @@
import * as application from "application";
import {NavPage} from "../nav-page";
import {Page} from "ui/page";
import * as trace from "trace";
trace.enable();
trace.setCategories(trace.categories.concat(
trace.categories.NativeLifecycle,

3
apps/perf-tests/custom-transition.android.ts
View File

@@ -1,5 +1,4 @@
import transition = require("ui/transition");
import platform = require("platform");
var floatType = java.lang.Float.class.getField("TYPE").get(null);
@@ -32,4 +31,4 @@ export class CustomTransition extends transition.Transition {
return animatorSet;
}
}
}

3
apps/perf-tests/custom-transition.ios.ts
View File

@@ -1,5 +1,4 @@
import transition = require("ui/transition");
import platform = require("platform");
export class CustomTransition extends transition.Transition {
public animateIOSTransition(containerView: UIView, fromView: UIView, toView: UIView, operation: UINavigationControllerOperation, completion: (finished: boolean) => void): void {
@@ -23,4 +22,4 @@ export class CustomTransition extends transition.Transition {
fromView.transform = CGAffineTransformMakeScale(0, 0);
}, completion);
}
}
}

1
apps/perf-tests/nav-page.ts
View File

@@ -8,7 +8,6 @@ import {Button} from "ui/button";
import {Label} from "ui/label";
import {TextField} from "ui/text-field";
import {Switch} from "ui/switch";
import {ListPicker} from "ui/list-picker";
import {Slider} from "ui/slider";
import {Color} from "color";
import * as platform from "platform";

4
apps/tests/layouts/absolute-layout-tests.ts
View File

@@ -1,8 +1,6 @@
import testModule = require("../ui-test");
import TKUnit = require("../TKUnit");
import viewModule = require("ui/core/view");
import labelModule = require("ui/label");
import helper = require("../ui/helper");
import colorModule = require("color");
import layoutHelper = require("./layout-helper");
import commonTests = require("./common-layout-tests");
@@ -129,4 +127,4 @@ export class AbsoluteLayoutTest extends testModule.UITest<absoluteLayoutModule.A
export function createTestCase(): AbsoluteLayoutTest {
return new AbsoluteLayoutTest();
}
}

4
apps/tests/layouts/dock-layout-tests.ts
View File

@@ -1,9 +1,7 @@
import pageModule = require("ui/page");
import button = require("ui/button");
import button = require("ui/button");
import {DockLayout} from "ui/layouts/dock-layout";
import TKUnit = require("../TKUnit");
import helper = require("./layout-helper");
import navHelper = require("../ui/helper");
import testModule = require("../ui-test");
import layoutHelper = require("./layout-helper");
import commonTests = require("./common-layout-tests");

15
apps/tests/layouts/grid-layout-tests.ts
View File

@@ -3,8 +3,6 @@ import {GridLayout, ItemSpec, GridUnitType} from "ui/layouts/grid-layout";
import {Button} from "ui/button";
import TKUnit = require("../TKUnit");
import view = require("ui/core/view");
import navHelper = require("../ui/helper");
import utils = require("utils/utils");
import builder = require("ui/builder");
import enums = require("ui/enums");
import testModule = require("../ui-test");
@@ -292,15 +290,15 @@ export class GridLayoutTest extends testModule.UITest<GridLayout> {
public test_ItemSpec_constructor_throws_onNegativeValue() {
TKUnit.assertThrows(() => {
new ItemSpec(-1, GridUnitType.auto);
return new ItemSpec(-1, GridUnitType.auto);
}, "'value' should be positive number.");
}
public test_ItemSpec_constructor_doesnt_throw_onCorrectType() {
try {
new ItemSpec(1, GridUnitType.auto);
new ItemSpec(1, GridUnitType.star);
new ItemSpec(1, GridUnitType.pixel);
var dummy = new ItemSpec(1, GridUnitType.auto);
dummy = new ItemSpec(1, GridUnitType.star);
dummy = new ItemSpec(1, GridUnitType.pixel);
}
catch (ex) {
TKUnit.assert(false, "ItemSpec type should support auto, star and pixel.");
@@ -309,7 +307,7 @@ export class GridLayoutTest extends testModule.UITest<GridLayout> {
public test_ItemSpec_constructor_throws_onWrongType() {
TKUnit.assertThrows(() => {
new ItemSpec(1, "unsupported");
return new ItemSpec(1, "unsupported");
}, "'ItemSpec type' incorrect value.");
}
@@ -529,7 +527,6 @@ export class GridLayoutTest extends testModule.UITest<GridLayout> {
}
private assertRows(grid: GridLayout) {
var columns: Array<ItemSpec> = grid.getColumns();
var rows: Array<ItemSpec> = grid.getRows();
TKUnit.assertEqual(rows.length, 4, "rows.length");
@@ -727,4 +724,4 @@ export class GridLayoutTest extends testModule.UITest<GridLayout> {
export function createTestCase(): GridLayoutTest {
return new GridLayoutTest();
}
}

5
apps/tests/layouts/layout-helper.android.ts
View File

@@ -1,5 +1,4 @@
import {View} from "ui/core/view";
import {Button} from "ui/button";
import {Button} from "ui/button";
import {StackLayout} from "ui/layouts/stack-layout";
import {GridLayout} from "ui/layouts/grid-layout";
@@ -256,4 +255,4 @@ export function dp(value: number): number {
export function dip(value: number): number {
return utils.layout.toDevicePixels(value);
}
}

5
apps/tests/layouts/layout-helper.d.ts vendored
View File

@@ -1,5 +1,4 @@
import {View} from "ui/core/view";
import {Button} from "ui/button";
import {Button} from "ui/button";
import {StackLayout} from "ui/layouts/stack-layout";
import {GridLayout} from "ui/layouts/grid-layout";
@@ -82,4 +81,4 @@ export class MyGridLayout extends GridLayout implements MeasuredView {
export function assertMeasure(view: MeasuredView, width: number, height: number, name?: string);
export function assertLayout(view: MeasuredView, left: number, top: number, width: number, height: number, name?: string): void;
export function dip(value: number): number;
export function dp(value: number): number;
export function dp(value: number): number;

7
apps/tests/layouts/stack-layout-tests.ts
View File

@@ -1,9 +1,7 @@
import {Page} from "ui/page";
import {StackLayout} from "ui/layouts/stack-layout";
import {StackLayout} from "ui/layouts/stack-layout";
import {Button} from "ui/button";
import TKUnit = require("../TKUnit");
import helper = require("./layout-helper");
import navHelper = require("../ui/helper");
import enums = require("ui/enums");
import utils = require("utils/utils");
import testModule = require("../ui-test");
@@ -39,7 +37,6 @@ export class StackLayoutTest extends testModule.UITest<StackLayout> {
public test_Orientation_Change() {
this.waitUntilTestElementLayoutIsValid();
var arrangeCount = this.rootLayout.arrangeCount;
TKUnit.assertEqual(this.rootLayout.orientation, enums.Orientation.vertical, "Default orientation should be Vertical.");
this.rootLayout.orientation = enums.Orientation.horizontal;
@@ -316,4 +313,4 @@ export class StackLayoutTest extends testModule.UITest<StackLayout> {
export function createTestCase(): StackLayoutTest {
return new StackLayoutTest();
}
}

3
apps/tests/layouts/wrap-layout-tests.ts
View File

@@ -1,6 +1,5 @@
import TKUnit = require("../TKUnit");
import {Label} from "ui/label";
import helper = require("../ui/helper");
import layoutHelper = require("./layout-helper");
import testModule = require("../ui-test");
import commonTests = require("./common-layout-tests");
@@ -351,4 +350,4 @@ export class WrapLayoutTest extends testModule.UITest<wrapLayoutModule.WrapLayou
export function createTestCase(): WrapLayoutTest {
return new WrapLayoutTest();
}
}

3
apps/tests/navigation/custom-transition.android.ts
View File

@@ -1,5 +1,4 @@
import transition = require("ui/transition");
import platform = require("platform");
var floatType = java.lang.Float.class.getField("TYPE").get(null);
@@ -36,4 +35,4 @@ export class CustomTransition extends transition.Transition {
return animatorSet;
}
}
}

3
apps/tests/navigation/custom-transition.ios.ts
View File

@@ -1,5 +1,4 @@
import transition = require("ui/transition");
import platform = require("platform");
export class CustomTransition extends transition.Transition {
constructor(duration: number, curve: any) {
@@ -27,4 +26,4 @@ export class CustomTransition extends transition.Transition {
fromView.transform = CGAffineTransformMakeScale(0, 0);
}, completion);
}
}
}

3
apps/tests/pages/page5.ts
View File

@@ -10,7 +10,6 @@ function printDeviceInfoAndroid() {
console.log("android.os.Build.VERSION.SDK_INT = " + android.os.Build.VERSION.SDK_INT); //android.os.Build.VERSION.SDK_INT = 19
console.log("android.os.Build.VERSION.CODENAME = " + android.os.Build.VERSION.CODENAME); //android.os.Build.VERSION.CODENAME = REL
console.log("android.os.Build.VERSION.RELEASE = " + android.os.Build.VERSION.RELEASE); //android.os.Build.VERSION.RELEASE = 4.4.4
android.os.Build.MANUFACTURER
var metrics: android.util.DisplayMetrics = app.android.context.getResources().getDisplayMetrics();
console.log("metrics.density = " + metrics.density); //metrics.density = 3
console.log("metrics.scaledDensity = " + metrics.scaledDensity); //metrics.scaledDensity = 3
@@ -83,4 +82,4 @@ export function createPage() {
page.content = grid;
return page;
}
//export var Page = page;
//export var Page = page;

4
apps/tests/ui/action-bar/action-bar-tests.android.ts
View File

@@ -3,7 +3,6 @@ import helper = require("../helper");
import TKUnit = require("../../TKUnit");
import { ActionItem } from "ui/action-bar";
import { Visibility } from "ui/enums";
import fs = require("file-system");
global.moduleMerge(actionTestsCommon, exports);
@@ -33,7 +32,6 @@ export function test_navigationButton_visibility() {
page.actionBar.navigationButton = actionItem;
var toolbar = <android.support.v7.widget.Toolbar>(<any>page.actionBar)._toolbar;
var menu = toolbar.getMenu();
TKUnit.assertNotNull(toolbar.getNavigationIcon(), "Visibility does not work");
actionItem.visibility = Visibility.collapse;
@@ -42,4 +40,4 @@ export function test_navigationButton_visibility() {
finally {
helper.goBack();
}
}
}

4
apps/tests/ui/action-bar/action-bar-tests.ios.ts
View File

@@ -9,8 +9,6 @@ import { Visibility } from "ui/enums";
global.moduleMerge(actionTestsCommon, exports);
var ASYNC = 0.2;
export function test_NavBar_isVisible_when_MenuItems_areSet() {
var page: PageModule.Page;
@@ -137,4 +135,4 @@ export function test_navigationButton_visibility() {
finally {
helper.goBack();
}
}
}

15
apps/tests/ui/button/button-tests.ts
View File

@@ -113,21 +113,6 @@ var _testSetText = function (views: Array<viewModule.View>) {
TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue);
}
var _testSetTextWrap = function (views: Array<viewModule.View>) {
var button = <buttonModule.Button>views[0];
// <snippet module="ui/button" title="button">
// ### Setting the text of a button
// ``` JavaScript
button.textWrap = true;
// ```
// </snippet>
var expectedValue = button.textWrap;
var actualValue = buttonTestsNative.getNativeTextWrap(button);
TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue);
}
var _testOnClick = function (views: Array<viewModule.View>) {
var button = <buttonModule.Button>views[0];

4
apps/tests/ui/helper.ts
View File

@@ -176,6 +176,7 @@ export function buildUIWithWeakRefAndInteract<T extends view.View>(createFunc: (
sp.removeChild(weakRef.get());
if (newPage.ios) {
/* tslint:disable:no-unused-expression */
// Could cause GC on the next call.
// NOTE: Don't replace this with forceGC();
new ArrayBuffer(4 * 1024 * 1024);
@@ -237,9 +238,10 @@ export function assertAreClose(actual: number, expected: number, message: string
export function forceGC() {
if (platform.device.os === platform.platformNames.ios) {
/* tslint:disable:no-unused-expression */
// Could cause GC on the next call.
new ArrayBuffer(4 * 1024 * 1024);
TKUnit.wait(ASYNC);
}
utils.GC();
}
}

48
apps/tests/ui/list-view/list-view-tests.ts
View File

@@ -1,9 +1,6 @@
import testModule = require("../../ui-test");
import TKUnit = require("../../TKUnit");
import testRunner = require("../../testRunner");
import app = require("application");
import helper = require("../helper");
import viewModule = require("ui/core/view");
import observable = require("data/observable");
import types = require("utils/types");
import platform = require("platform");
@@ -637,36 +634,37 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
this.assertNoMemoryLeak(weakRef);
}
private test_view_in_itemLoading_is_not_collected_prematurely() {
let weakRef: WeakRef<labelModule.Label>;
//private test_view_in_itemLoading_is_not_collected_prematurely() {
//let weakRef: WeakRef<labelModule.Label>;
let handler = function (args: listViewModule.ItemEventData) {
let lbl = new labelModule.Label();
lbl.text = args.index.toString();
weakRef = new WeakRef(lbl);
args.view = lbl;
let listView: listViewModule.ListView = <listViewModule.ListView>args.object;
listView.off("itemLoading", handler);
};
//let handler = function (args: listViewModule.ItemEventData) {
//let lbl = new labelModule.Label();
//lbl.text = args.index.toString();
//weakRef = new WeakRef(lbl);
//args.view = lbl;
//let listView: listViewModule.ListView = <listViewModule.ListView>args.object;
//listView.off("itemLoading", handler);
//};
this.testView.on("itemLoading", handler);
this.testView.items = [1];
TKUnit.waitUntilReady(() => { return this.getNativeViewCount(this.testView) === this.testView.items.length; }, ASYNC);
//this.testView.on("itemLoading", handler);
//this.testView.items = [1];
//TKUnit.waitUntilReady(() => { return this.getNativeViewCount(this.testView) === this.testView.items.length; }, ASYNC);
if (platform.device.os === platform.platformNames.ios) {
// Could cause GC on the next call.
// NOTE: Don't replace this with forceGC();
new ArrayBuffer(4 * 1024 * 1024);
}
utils.GC();
//if (platform.device.os === platform.platformNames.ios) {
//// Could cause GC on the next call.
//// NOTE: Don't replace this with forceGC();
//new ArrayBuffer(4 * 1024 * 1024);
//}
//utils.GC();
TKUnit.assert(weakRef.get(), weakRef.get() + " died prematurely!");
}
//TKUnit.assert(weakRef.get(), weakRef.get() + " died prematurely!");
//}
private assertNoMemoryLeak(weakRef: WeakRef<listViewModule.ListView>) {
this.tearDown();
TKUnit.waitUntilReady(() => {
if (platform.device.os === platform.platformNames.ios) {
/* tslint:disable:no-unused-expression */
// Could cause GC on the next call.
// NOTE: Don't replace this with forceGC();
new ArrayBuffer(4 * 1024 * 1024);
@@ -777,4 +775,4 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
export function createTestCase(): ListViewTest {
return new ListViewTest();
}
}

3
apps/tests/ui/page/page-tests-common.ts
View File

@@ -27,7 +27,6 @@ import LabelModule = require("ui/label");
import stackLayoutModule = require("ui/layouts/stack-layout");
import helper = require("../helper");
import view = require("ui/core/view");
import platform = require("platform");
import observable = require("data/observable");
export function addLabelToPage(page: PageModule.Page, text?: string) {
@@ -476,4 +475,4 @@ export function test_WhenNavigatingForwardAndBack_IsBackNavigationIsCorrect() {
// helper.goBack
// helper.goBack();
// }
//}
//}

1
apps/tests/ui/proxy-view-container/proxy-view-container-tests.ts
View File

@@ -4,7 +4,6 @@ import {View} from "ui/core/view";
import {Button} from "ui/button";
import {Page} from "ui/page";
import {ScrollView} from "ui/scroll-view";
import {TabView, TabViewItem} from "ui/tab-view";
import {LayoutBase} from "ui/layouts/layout-base"
import {StackLayout} from "ui/layouts/stack-layout"
import {GridLayout} from "ui/layouts/grid-layout"

5
apps/tests/ui/scroll-view/scroll-view-tests.ts
View File

@@ -1,8 +1,6 @@
import TKUnit = require("../../TKUnit");
import app = require("application");
import helper = require("../helper");
import buttonModule = require("ui/button");
import page = require("ui/page");
import button = require("ui/button");
import enums = require("ui/enums");
import testModule = require("../../ui-test");
@@ -45,6 +43,7 @@ class ScrollLayoutTest extends testModule.UITest<scrollViewModule.ScrollView> {
}
public test_snippets() {
/* tslint:disable:no-unused-variable */
// <snippet module="ui/scroll-view" title="scroll-view">
// ### Creating a ScrollView
// ``` JavaScript
@@ -263,4 +262,4 @@ class ScrollLayoutTest extends testModule.UITest<scrollViewModule.ScrollView> {
export function createTestCase(): ScrollLayoutTest {
return new ScrollLayoutTest();
}
}

256
apps/tests/ui/tab-view/tab-view-navigation-tests.ts
View File

@@ -1,70 +1,58 @@
import TKUnit = require("../../TKUnit");
import helper = require("../helper");
import {Label} from "ui/label";
import {StackLayout} from "ui/layouts/stack-layout";
import frameModule = require("ui/frame");
import {Page} from "ui/page";
import {ListView, ItemEventData} from "ui/list-view";
import {TabView, TabViewItem} from "ui/tab-view";
import {Button} from "ui/button";
//function _createTabView(): TabView {
//var tabView = new TabView();
//tabView.id = "TabView";
//return tabView;
//}
var ASYNC = 2;
//function _createItems(count: number): Array<TabViewItem> {
//var items = new Array<TabViewItem>();
//for (var i = 0; i < count; i++) {
//var label = new Label();
//label.text = "Tab " + i;
//var tabEntry = new TabViewItem({
//title: "Tab " + i,
//view: label
//});
//items.push(tabEntry);
//}
//return items;
//}
function _createTabView(): TabView {
var tabView = new TabView();
tabView.id = "TabView";
return tabView;
}
//function _createListView(): ListView {
//var listView = new ListView();
//listView.id = "ListView";
//var items = Array.apply(null, Array(10)).map(function (_, i) { return i; });
function _createItems(count: number): Array<TabViewItem> {
var items = new Array<TabViewItem>();
for (var i = 0; i < count; i++) {
var label = new Label();
label.text = "Tab " + i;
var tabEntry = new TabViewItem({
title: "Tab " + i,
view: label
});
items.push(tabEntry);
}
return items;
}
//listView.on(ListView.itemLoadingEvent, function (args: ItemEventData) {
//var button = <Button>args.view;
//if (!button) {
//button = new Button();
//args.view = button;
//}
function _createListView(): ListView {
var listView = new ListView();
listView.id = "ListView";
var items = Array.apply(null, Array(10)).map(function (_, i) { return i; });
//button.text = "Button" + args.index;
//button.id = button.text;
//button.on(Button.tapEvent, _clickHandlerFactory(args.index));
//});
listView.on(ListView.itemLoadingEvent, function (args: ItemEventData) {
var button = <Button>args.view;
if (!button) {
button = new Button();
args.view = button;
}
//listView.items = items;
button.text = "Button" + args.index;
button.id = button.text;
button.on(Button.tapEvent, _clickHandlerFactory(args.index));
});
//return listView;
//}
listView.items = items;
//var _clickHandlerFactory = function (index: number) {
//return function () {
//var pageFactory = function (): Page {
//var detailsLabel = new Label();
//detailsLabel.text = "Details Page " + index;
//var detailsPage = new Page();
//detailsPage.content = detailsLabel;
//return detailsPage;
//};
return listView;
}
var _clickHandlerFactory = function (index: number) {
return function () {
var pageFactory = function (): Page {
var detailsLabel = new Label();
detailsLabel.text = "Details Page " + index;
var detailsPage = new Page();
detailsPage.content = detailsLabel;
return detailsPage;
};
helper.navigate(pageFactory);
}
}
//helper.navigate(pageFactory);
//}
//}
export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithAListViewTheListViewIsThere() {
/*
@@ -136,92 +124,92 @@ export function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack_WithPage
testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack(true);
}
*/
function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack(enablePageCache: boolean) {
var i: number;
var itemCount = 3;
var loadedItems = [0, 0, 0];
var unloadedItems = [0, 0, 0];
//function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack(enablePageCache: boolean) {
//var i: number;
//var itemCount = 3;
//var loadedItems = [0, 0, 0];
//var unloadedItems = [0, 0, 0];
var topFrame = frameModule.topmost();
var oldChache;
//var topFrame = frameModule.topmost();
//var oldChache;
if (topFrame.android) {
oldChache = topFrame.android.cachePagesOnNavigate;
topFrame.android.cachePagesOnNavigate = enablePageCache;
}
//if (topFrame.android) {
//oldChache = topFrame.android.cachePagesOnNavigate;
//topFrame.android.cachePagesOnNavigate = enablePageCache;
//}
try {
var tabView = _createTabView();
var items = _createItems(itemCount);
tabView.items = items;
//try {
//var tabView = _createTabView();
//var items = _createItems(itemCount);
//tabView.items = items;
function createLoadedFor(itemIndex: number) {
return function () {
loadedItems[itemIndex] = loadedItems[itemIndex] + 1;
}
}
//function createLoadedFor(itemIndex: number) {
//return function () {
//loadedItems[itemIndex] = loadedItems[itemIndex] + 1;
//}
//}
function createUnloadedFor(itemIndex: number) {
return function () {
unloadedItems[itemIndex] = unloadedItems[itemIndex] + 1;
}
}
//function createUnloadedFor(itemIndex: number) {
//return function () {
//unloadedItems[itemIndex] = unloadedItems[itemIndex] + 1;
//}
//}
helper.buildUIAndRunTest(tabView, function () {
try {
TKUnit.waitUntilReady(() => { return items[0].view.isLoaded; }, ASYNC);
//helper.buildUIAndRunTest(tabView, function () {
//try {
//TKUnit.waitUntilReady(() => { return items[0].view.isLoaded; }, ASYNC);
// Attach to loaded/unloaded events
for (i = 0; i < itemCount; i++) {
items[i].view.on("loaded", createLoadedFor(i));
items[i].view.on("unloaded", createUnloadedFor(i));
}
//// Attach to loaded/unloaded events
//for (i = 0; i < itemCount; i++) {
//items[i].view.on("loaded", createLoadedFor(i));
//items[i].view.on("unloaded", createUnloadedFor(i));
//}
var detailsPageFactory = function (): Page {
var detailsPage = new Page();
detailsPage.content = new Label();
return detailsPage;
};
//var detailsPageFactory = function (): Page {
//var detailsPage = new Page();
//detailsPage.content = new Label();
//return detailsPage;
//};
helper.navigate(detailsPageFactory);
}
finally {
// Go back to the test page.
helper.goBack();
}
//helper.navigate(detailsPageFactory);
//}
//finally {
//// Go back to the test page.
//helper.goBack();
//}
TKUnit.waitUntilReady(() => { return items[0].view.isLoaded; }, ASYNC);
//TKUnit.waitUntilReady(() => { return items[0].view.isLoaded; }, ASYNC);
//console.log(">>>>>>>>>>>>> loaded items: " + loadedItems.join(", "));
//console.log(">>>>>>>>>>>>> unloadedItems items: " + unloadedItems.join(", "));
////console.log(">>>>>>>>>>>>> loaded items: " + loadedItems.join(", "));
////console.log(">>>>>>>>>>>>> unloadedItems items: " + unloadedItems.join(", "));
// Check that at least the first item is loaded and unloaded
TKUnit.assert(items[0].view.isLoaded, "The content of the first tab should be loaded.");
TKUnit.assertEqual(loadedItems[0], 1, "loaded count for 1st item");
TKUnit.assertEqual(unloadedItems[0], 1, "unloaded count for 1st item");
//// Check that at least the first item is loaded and unloaded
//TKUnit.assert(items[0].view.isLoaded, "The content of the first tab should be loaded.");
//TKUnit.assertEqual(loadedItems[0], 1, "loaded count for 1st item");
//TKUnit.assertEqual(unloadedItems[0], 1, "unloaded count for 1st item");
// Check that loaded/unloaded coutns are equal for all tabs
for (i = 0; i < itemCount; i++) {
TKUnit.assert(loadedItems[i] === unloadedItems[i],
"Loaded and unloaded calls are not equal for item " + i + " loaded: " + loadedItems[i] + " unloaded: " + unloadedItems[i]);
}
});
}
finally {
// Return original page cache value
if (topFrame.android) {
topFrame.android.cachePagesOnNavigate = oldChache;
}
}
}
//// Check that loaded/unloaded coutns are equal for all tabs
//for (i = 0; i < itemCount; i++) {
//TKUnit.assert(loadedItems[i] === unloadedItems[i],
//"Loaded and unloaded calls are not equal for item " + i + " loaded: " + loadedItems[i] + " unloaded: " + unloadedItems[i]);
//}
//});
//}
//finally {
//// Return original page cache value
//if (topFrame.android) {
//topFrame.android.cachePagesOnNavigate = oldChache;
//}
//}
//}
function _clickTheFirstButtonInTheListViewNatively(tabView: TabView) {
if (tabView.android) {
var viewPager: android.support.v4.view.ViewPager = (<any>tabView)._viewPager;
var androidListView = <android.widget.ListView>viewPager.getChildAt(0);
(<android.widget.Button>androidListView.getChildAt(0)).performClick();
}
else {
(<UIButton>(<UITableView>tabView.ios.viewControllers[0].view.subviews[0]).cellForRowAtIndexPath(NSIndexPath.indexPathForItemInSection(0, 0)).contentView.subviews[0]).sendActionsForControlEvents(UIControlEvents.UIControlEventTouchUpInside);
}
}
//function _clickTheFirstButtonInTheListViewNatively(tabView: TabView) {
//if (tabView.android) {
//var viewPager: android.support.v4.view.ViewPager = (<any>tabView)._viewPager;
//var androidListView = <android.widget.ListView>viewPager.getChildAt(0);
//(<android.widget.Button>androidListView.getChildAt(0)).performClick();
//}
//else {
//(<UIButton>(<UITableView>tabView.ios.viewControllers[0].view.subviews[0]).cellForRowAtIndexPath(NSIndexPath.indexPathForItemInSection(0, 0)).contentView.subviews[0]).sendActionsForControlEvents(UIControlEvents.UIControlEventTouchUpInside);
//}
//}

49
apps/tests/ui/tab-view/tab-view-tests.ts
View File

@@ -1,16 +1,9 @@
import testModule = require("../../ui-test");
import TKUnit = require("../../TKUnit");
import helper = require("../helper");
import viewModule = require("ui/core/view");
import labelModule = require("ui/label");
import stackLayoutModule = require("ui/layouts/stack-layout");
import tabViewTestsNative = require("./tab-view-tests-native");
import frameModule = require("ui/frame");
import pageModule = require("ui/page");
import listViewModule = require("ui/list-view");
import buttonModule = require("ui/button");
import observable = require("data/observable");
import builder = require("ui/builder");
// <snippet module="ui/tab-view" title="TabView">
// # TabView
@@ -41,8 +34,6 @@ import tabViewModule = require("ui/tab-view");
// ```
// </snippet>
var ASYNC = 2;
export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
public create(): tabViewModule.TabView {
@@ -56,7 +47,7 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
return tabView;
}
private _createItems(count: number): Array<tabViewModule.TabViewItem> {
_createItems(count: number): Array<tabViewModule.TabViewItem> {
var items = new Array<tabViewModule.TabViewItem>();
for (var i = 0; i < count; i++) {
var label = new labelModule.Label();
@@ -70,42 +61,6 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
return items;
}
private _createListView(): listViewModule.ListView {
var listView = new listViewModule.ListView();
listView.id = "ListView";
var items = Array.apply(null, Array(10)).map(function (_, i) { return i; });
listView.on(listViewModule.ListView.itemLoadingEvent, function (args: listViewModule.ItemEventData) {
var button = <buttonModule.Button>args.view;
if (!button) {
button = new buttonModule.Button();
args.view = button;
}
button.text = "Button" + args.index;
button.id = button.text;
button.on(buttonModule.Button.tapEvent, this._clickHandlerFactory(args.index));
});
listView.items = items;
return listView;
}
private _clickHandlerFactory = function (index: number) {
return function () {
var pageFactory = function (): pageModule.Page {
var detailsLabel = new labelModule.Label();
detailsLabel.text = "Details Page " + index;
var detailsPage = new pageModule.Page();
detailsPage.content = detailsLabel;
return detailsPage;
};
helper.navigate(pageFactory);
}
}
public testWhenTabViewIsCreatedItemsAreUndefined = function () {
TKUnit.assertEqual(this.testView.items, undefined, "Items should be undefined initally.");
}
@@ -392,4 +347,4 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
export function createTestCase(): TabViewTest {
return new TabViewTest();
}
}

3
apps/tests/ui/text-field/text-field-tests.ts
View File

@@ -1,5 +1,4 @@
import TKUnit = require("../../TKUnit");
import testRunner = require("../../testRunner");
import helper = require("../helper");
import viewModule = require("ui/core/view");
import pagesModule = require("ui/page");
@@ -468,4 +467,4 @@ export var testMemoryLeak = function (done) {
helper.buildUIWithWeakRefAndInteract(_createTextFieldFunc, function (textField) {
textFieldTestsNative.typeTextNatively(textField, "Hello, world!");
}, done);
}
}

1
apps/tests/ui/text-view/text-view-tests.ts
View File

@@ -1,5 +1,4 @@
import TKUnit = require("../../TKUnit");
import testRunner = require("../../testRunner");
import helper = require("../helper");
import viewModule = require("ui/core/view");
import pagesModule = require("ui/page");

4
apps/tests/ui/web-view/web-view-tests.ts
View File

@@ -1,6 +1,4 @@
import TKUnit = require("../../TKUnit");
import helper = require("../helper");
import page = require("ui/page");
import testModule = require("../../ui-test");
// <snippet module="ui/web-view" title="WebView">
@@ -191,4 +189,4 @@ export class WebViewTest extends testModule.UITest<webViewModule.WebView> {
export function createTestCase(): WebViewTest {
return new WebViewTest();
}
}

4
apps/tests/xml-declaration/template-builder-tests/template-view.ts
View File

@@ -1,5 +1,5 @@
import { View, Template } from "ui/core/view"
import { PropertyChangeData, Property, PropertyMetadataSettings } from "ui/core/dependency-observable"
import {Template} from "ui/core/view"
import {Property, PropertyMetadataSettings} from "ui/core/dependency-observable"
import * as proxy from "ui/core/proxy"
import { LayoutBase } from "ui/layouts/layout-base"
import { parse } from "ui/builder"

7
apps/tests/xml-declaration/xml-declaration-tests.ts
View File

@@ -14,7 +14,6 @@ import stackLayoutModule = require("ui/layouts/stack-layout");
import {Label} from "ui/label";
import {Page} from "ui/page";
import {Button} from "ui/button";
import {View} from "ui/core/view";
import {TabView} from "ui/tab-view";
import {Observable} from "data/observable";
import {TemplateView} from "./template-builder-tests/template-view";
@@ -882,8 +881,6 @@ export function test_EventInTemplate() {
notified = true;
}
var basePath = "xml-declaration/";
var message;
var page = builder.load(__dirname + "/template-builder-tests/event-in-template.xml", pageCode);
TKUnit.assert(view, "Expected the xml to generate a page");
var templateView = <TemplateView>page.getViewById("template-view");
@@ -908,8 +905,6 @@ export function test_EventInCodelessFragment() {
notified = true;
}
var basePath = "xml-declaration/";
var message;
var page = builder.load(__dirname + "/template-builder-tests/event-in-codeless-fragment.xml", pageCode);
TKUnit.assert(view, "Expected the xml to generate a page");
var templateView = <TemplateView>page.getViewById("template-view");
@@ -971,4 +966,4 @@ export function test_TabViewHasCorrectParentChain() {
var model = new Observable();
model.set("testPassed", false);
helper.navigateToModuleAndRunTest(("." + moduleName + "/mymodulewithxml/TabViewParentChain"), model, testFunc);
}
}

3
apps/ui-tests-app/css/text-decoration.ts
View File

@@ -1,5 +1,4 @@
import view = require("ui/core/view");
import observable = require("data/observable");
import label = require("ui/label");
import button = require("ui/button");
import textField = require("ui/text-field");
@@ -38,4 +37,4 @@ export function butonTap(args) {
textField.style.textDecoration = "none";
textView.style.textDecoration = "none";
}
}
}

3
apps/ui-tests-app/css/text-transform.ts
View File

@@ -1,5 +1,4 @@
import view = require("ui/core/view");
import observable = require("data/observable");
import label = require("ui/label");
import button = require("ui/button");
import textField = require("ui/text-field");
@@ -48,4 +47,4 @@ export function butonTap(args) {
//textField.style.textDecoration = "none";
//textView.style.textDecoration = "none";
}
}
}

7
apps/ui-tests-app/mainPage.ts
View File

@@ -1,12 +1,7 @@
import button = require("ui/button");
import frame = require("ui/frame");
import gridModule = require("ui/layouts/grid-layout");
import frame = require("ui/frame");
import pages = require("ui/page");
import text = require("ui/text-view");
import fs = require("file-system");
import trace = require("trace");
import observable = require("data/observable");
import view = require("ui/core/view");
import dialogs = require("ui/dialogs");
trace.enable();

4
apps/ui-tests-app/pages/touch-event.ts
View File

@@ -1,6 +1,4 @@
import {View} from "ui/core/view";
import {Page} from "ui/page";
import {TextView} from "ui/text-view";
import {TextView} from "ui/text-view";
import gestures = require("ui/gestures");
export function onTouch(args: gestures.TouchGestureEventData) {

3
apps/ui-tests-app/transitions/page0.ts
View File

@@ -1,5 +1,4 @@
import frame = require("ui/frame");
import pages = require("ui/page");
export function onTap(args) {
var navigationEntry = {
@@ -12,4 +11,4 @@ export function onTap(args) {
}
};
frame.topmost().navigate(navigationEntry);
}
}

3
apps/ui-tests-app/transitions/page1.ts
View File

@@ -1,5 +1,4 @@
import frame = require("ui/frame");
import pages = require("ui/page");
export function onTap(args) {
var navigationEntry = {
@@ -12,4 +11,4 @@ export function onTap(args) {
}
};
frame.topmost().navigate(navigationEntry);
}
}