Improve Binding class (#2038)

Remove options parameter
This commit is contained in:
Hristo Hristov
2016-04-27 16:43:45 +03:00
parent 264fe170a9
commit b2c182fd7a
47 changed files with 325 additions and 654 deletions

View File

@@ -12,7 +12,8 @@ page.id = "mainPage";
page.on(Page.navigatedToEvent, onNavigatedTo);
function onNavigatedTo(args) {
let label = new Label({ text: "Running non-UI tests..." });
let label = new Label();
label.text = "Running non-UI tests...";
page.content = label
args.object.off(Page.navigatedToEvent, onNavigatedTo);
setTimeout(function () {

View File

@@ -15,10 +15,10 @@ export function createPage() {
topFrame.goBack();
});
tab.items.push(new tabViewModule.TabViewItem({
title: "Tab " + i,
view: button
}));
let item = new tabViewModule.TabViewItem();
item.title = "Tab " + i;
item.view = button;
tab.items.push(item);
}
var page = new pages.Page();
page.content = tab;

View File

@@ -12,7 +12,9 @@ import animation = require("ui/animation");
function prepareTest(): Label {
let mainPage = helper.getCurrentPage();
let label = new Label({ text: "label" });
let label = new Label();
label.text = "label";
let stackLayout = new StackLayout();
stackLayout.addChild(label);
mainPage.content = stackLayout;
@@ -170,9 +172,12 @@ export function test_ReusingAnimations(done) {
export function test_AnimatingMultipleViews(done) {
let mainPage = helper.getCurrentPage();
let label1 = new Label({ text: "label1" });
let label2 = new Label({ text: "label2" });
let label3 = new Label({ text: "label3" });
let label1 = new Label();
label1.text = "label1";
let label2 = new Label();
label2.text = "label2";
let label3 = new Label();
label3.text = "label3";
let stackLayout = new StackLayout();
stackLayout.addChild(label1);
stackLayout.addChild(label2);

View File

@@ -247,7 +247,8 @@ export function test_LoadAnimationProgrammatically() {
export function test_ExecuteCSSAnimation() {
let mainPage = helper.getCurrentPage();
mainPage.css = null;
let label = new labelModule.Label({ text: "label" });
let label = new labelModule.Label()
label.text = "label";
let stackLayout = new stackModule.StackLayout();
stackLayout.addChild(label);

View File

@@ -179,7 +179,7 @@ export var test_bindingContext_Change_IsReflected_Properly = function () {
views[0].bindingContext = undefined;
model.set("testProperty", "updatedValue");
TKUnit.assert(button.text === "testValue", "Binding not properly detached when bindingContext is cleared.");
TKUnit.assertEqual(button.text, "", "Binding not properly detached when bindingContext is cleared.");
}
helper.do_PageTest_WithButton(test);

View File

@@ -33,7 +33,7 @@ class ScrollLayoutTest extends testModule.UITest<scrollViewModule.ScrollView> {
// >> article-creating-scrollview
var scrollView = new scrollViewModule.ScrollView();
// << article-creating-scrollview
console.dump(scrollView);
TKUnit.assertTrue(scrollView !== null, "ScrollView should be created.");
}
public test_default_TNS_values() {

View File

@@ -21,7 +21,9 @@ function _createSegmentedBar(): segmentedBarModule.SegmentedBar {
function _createItems(count: number): Array<segmentedBarModule.SegmentedBarItem> {
var items = new Array<segmentedBarModule.SegmentedBarItem>();
for (var i = 0; i < count; i++) {
items.push(new segmentedBarModule.SegmentedBarItem({ title: i + "" }));
let bar = new segmentedBarModule.SegmentedBarItem();
bar.title = i + "";
items.push(bar);
}
return items;
}

View File

@@ -103,7 +103,10 @@ export function test_css_is_applied_inside_TabView() {
var testButton = new buttonModule.Button();
testButton.text = "Test";
var tabView = new tabViewModule.TabView();
tabView.items = [new tabViewModule.TabViewItem({ title: "First tab", view: testButton })];
let item = new tabViewModule.TabViewItem();
item.title = "First tab";
item.view = testButton;
tabView.items = [item];
helper.buildUIAndRunTest(tabView, function (views: Array<viewModule.View>) {
var page = <pageModule.Page>views[1];

View File

@@ -21,10 +21,9 @@ function _createItems(count: number): 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
});
var tabEntry = new TabViewItem();
tabEntry.title = "Tab " + i;
tabEntry.view = label;
tabEntry["index"] = i;
items.push(tabEntry);
}

View File

@@ -25,10 +25,9 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
for (var i = 0; i < count; i++) {
var label = new labelModule.Label();
label.text = "Tab " + i;
var tabEntry = new tabViewModule.TabViewItem({
title: "Tab " + i,
view: label
});
var tabEntry = new tabViewModule.TabViewItem();
tabEntry.title = "Tab " + i;
tabEntry.view = label;
items.push(tabEntry);
}
return items;
@@ -48,7 +47,7 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
let expectedValue = this.testView.items.length;
let actualValue = tabViewTestsNative.getNativeTabCount(this.testView);
TKUnit.assertEqual(actualValue, expectedValue, "NativeItems not equal to JS items.");
}
@@ -181,7 +180,11 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
this.waitUntilTestElementIsLoaded();
TKUnit.assertThrows(function () {
tabView.items = [new tabViewModule.TabViewItem({ title: "Tab 0", view: undefined })];
let item = new tabViewModule.TabViewItem();
item.title = "Tab 0";
item.view = undefined;
tabView.items = [item];
}, "Binding TabView to a TabViewItem with undefined view should throw.");
}
@@ -190,7 +193,11 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
this.waitUntilTestElementIsLoaded();
TKUnit.assertThrows(function () {
tabView.items = [new tabViewModule.TabViewItem({ title: "Tab 0", view: null })];
let item = new tabViewModule.TabViewItem();
item.title = "Tab 0";
item.view = null;
tabView.items = [item];
}, "Binding TabView to a TabViewItem with null view should throw.");
}