Skip to content

Commit 66bbf21

Browse files
ADjenkovADjenkov
committed
chore(tests): update tests to use content instead of view
1 parent 2cd39a4 commit 66bbf21

6 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎tests/app/ui/bottom-navigation/bottom-navigation-navigation-tests.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function _createContentItems(count: number): Array<TabContentItem> {
2323
const label = new Label();
2424
label.text = "Tab " + i;
2525
const tabEntry = new TabContentItem();
26-
tabEntry.view = label;
26+
tabEntry.content = label;
2727
items.push(tabEntry);
2828
}
2929

@@ -101,12 +101,12 @@ export function testBackNavigationToTabViewWithNestedFramesShouldWork() {
101101
let items = Array<TabContentItem>();
102102
let tabViewitem = new TabContentItem();
103103
// tabViewitem.title = "Item1";
104-
tabViewitem.view = _createFrameView();
104+
tabViewitem.content = _createFrameView();
105105
items.push(tabViewitem);
106106

107107
let tabViewitem2 = new TabContentItem();
108108
// tabViewitem2.title = "Item2";
109-
tabViewitem2.view = _createFrameView();
109+
tabViewitem2.content = _createFrameView();
110110
items.push(tabViewitem2);
111111

112112
tabView.items = items;
@@ -145,7 +145,7 @@ export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithALis
145145
let items = Array<TabContentItem>();
146146
let tabViewitem = new TabContentItem();
147147
// tabViewitem.title = "List";
148-
tabViewitem.view = _createListView();
148+
tabViewitem.content = _createListView();
149149
items.push(tabViewitem);
150150

151151
let label = new Label();
@@ -155,7 +155,7 @@ export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithALis
155155
aboutLayout.addChild(label);
156156
tabViewitem = new TabContentItem();
157157
// tabViewitem.title = "About";
158-
tabViewitem.view = aboutLayout;
158+
tabViewitem.content = aboutLayout;
159159
items.push(tabViewitem);
160160

161161
tabView.items = items;
@@ -184,7 +184,7 @@ export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithALis
184184

185185
TKUnit.waitUntilReady(() => topFrame.currentPage === rootPage);
186186

187-
TKUnit.assert(tabView.items[0].view instanceof ListView, "ListView should be created when navigating back to the main page.");
187+
TKUnit.assert(tabView.items[0].content instanceof ListView, "ListView should be created when navigating back to the main page.");
188188
}
189189

190190
function tabViewIsFullyLoaded(tabView: BottomNavigation): boolean {
@@ -232,8 +232,8 @@ export function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack() {
232232
}
233233

234234
tabView.items.forEach((item, i) => {
235-
item.view.on("loaded", createLoadedFor(i));
236-
item.view.on("unloaded", createUnloadedFor(i));
235+
item.content.on("loaded", createLoadedFor(i));
236+
item.content.on("unloaded", createUnloadedFor(i));
237237
});
238238

239239
const tabViewPage = new Page();
@@ -252,8 +252,8 @@ export function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack() {
252252
TKUnit.assertEqual(topFrame.currentPage, tabViewPage);
253253

254254
for (let i = 0; i < itemCount; i++) {
255-
tabView.items[i].view.off("loaded");
256-
tabView.items[i].view.off("unloaded");
255+
tabView.items[i].content.off("loaded");
256+
tabView.items[i].content.off("unloaded");
257257
}
258258

259259
helper.goBack();
@@ -267,7 +267,7 @@ export function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack() {
267267

268268
function _clickTheFirstButtonInTheListViewNatively(tabView: BottomNavigation) {
269269
if (tabView.android) {
270-
const androidListView = <android.widget.ListView>tabView.items[0].view.nativeView;
270+
const androidListView = <android.widget.ListView>tabView.items[0].content.nativeView;
271271
// var viewPager: android.support.v4.view.ViewPager = (<any>tabView)._viewPager;
272272
// var androidListView = <android.widget.ListView>viewPager.getChildAt(0);
273273
var stackLayout = <org.nativescript.widgets.StackLayout>androidListView.getChildAt(0);

‎tests/app/ui/bottom-navigation/bottom-navigation-root-tests.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function createFrame(i: number, page: Page) {
4747
function createTabItem(i: number, frame: Frame) {
4848
const tabEntry = new TabContentItem();
4949
// tabEntry.title = "Tab " + i;
50-
tabEntry.view = frame;
50+
tabEntry.content = frame;
5151
tabEntry["index"] = i;
5252

5353
return tabEntry;

‎tests/app/ui/bottom-navigation/bottom-navigation-tests.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class BottomNavigationTest extends UITest<BottomNavigation> {
2727
const label = new Label();
2828
label.text = "Tab " + i;
2929
const tabEntry = new TabContentItem();
30-
tabEntry.view = label;
30+
tabEntry.content = label;
3131
items.push(tabEntry);
3232
}
3333

@@ -208,7 +208,7 @@ export class BottomNavigationTest extends UITest<BottomNavigation> {
208208
TKUnit.assertThrows(() => {
209209
let item = new TabContentItem();
210210
// item.title = "Tab 0";
211-
item.view = undefined;
211+
item.content = undefined;
212212
tabView.items = [item];
213213

214214
}, "Binding TabNavigation to a TabItem with undefined view should throw.");
@@ -221,7 +221,7 @@ export class BottomNavigationTest extends UITest<BottomNavigation> {
221221
TKUnit.assertThrows(() => {
222222
let item = new TabContentItem();
223223
// item.title = "Tab 0";
224-
item.view = null;
224+
item.content = null;
225225
tabView.items = [item];
226226

227227
}, "Binding TabNavigation to a TabItem with null view should throw.");

‎tests/app/ui/tabs/tabs-navigation-tests.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function _createContentItems(count: number): Array<TabContentItem> {
2323
const label = new Label();
2424
label.text = "Tab " + i;
2525
const tabEntry = new TabContentItem();
26-
tabEntry.view = label;
26+
tabEntry.content = label;
2727
items.push(tabEntry);
2828
}
2929

@@ -101,12 +101,12 @@ export function testBackNavigationToTabViewWithNestedFramesShouldWork() {
101101
let items = Array<TabContentItem>();
102102
let tabViewitem = new TabContentItem();
103103
// tabViewitem.title = "Item1";
104-
tabViewitem.view = _createFrameView();
104+
tabViewitem.content = _createFrameView();
105105
items.push(tabViewitem);
106106

107107
let tabViewitem2 = new TabContentItem();
108108
// tabViewitem2.title = "Item2";
109-
tabViewitem2.view = _createFrameView();
109+
tabViewitem2.content = _createFrameView();
110110
items.push(tabViewitem2);
111111

112112
tabView.items = items;
@@ -145,7 +145,7 @@ export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithALis
145145
let items = Array<TabContentItem>();
146146
let tabViewitem = new TabContentItem();
147147
// tabViewitem.title = "List";
148-
tabViewitem.view = _createListView();
148+
tabViewitem.content = _createListView();
149149
items.push(tabViewitem);
150150

151151
let label = new Label();
@@ -155,7 +155,7 @@ export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithALis
155155
aboutLayout.addChild(label);
156156
tabViewitem = new TabContentItem();
157157
// tabViewitem.title = "About";
158-
tabViewitem.view = aboutLayout;
158+
tabViewitem.content = aboutLayout;
159159
items.push(tabViewitem);
160160

161161
tabView.items = items;
@@ -184,7 +184,7 @@ export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithALis
184184

185185
TKUnit.waitUntilReady(() => topFrame.currentPage === rootPage);
186186

187-
TKUnit.assert(tabView.items[0].view instanceof ListView, "ListView should be created when navigating back to the main page.");
187+
TKUnit.assert(tabView.items[0].content instanceof ListView, "ListView should be created when navigating back to the main page.");
188188
}
189189

190190
function tabViewIsFullyLoaded(tabView: Tabs): boolean {
@@ -232,8 +232,8 @@ export function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack() {
232232
}
233233

234234
tabView.items.forEach((item, i) => {
235-
item.view.on("loaded", createLoadedFor(i));
236-
item.view.on("unloaded", createUnloadedFor(i));
235+
item.content.on("loaded", createLoadedFor(i));
236+
item.content.on("unloaded", createUnloadedFor(i));
237237
});
238238

239239
const tabViewPage = new Page();
@@ -252,8 +252,8 @@ export function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack() {
252252
TKUnit.assertEqual(topFrame.currentPage, tabViewPage);
253253

254254
for (let i = 0; i < itemCount; i++) {
255-
tabView.items[i].view.off("loaded");
256-
tabView.items[i].view.off("unloaded");
255+
tabView.items[i].content.off("loaded");
256+
tabView.items[i].content.off("unloaded");
257257
}
258258

259259
helper.goBack();
@@ -267,7 +267,7 @@ export function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack() {
267267

268268
function _clickTheFirstButtonInTheListViewNatively(tabView: Tabs) {
269269
if (tabView.android) {
270-
const androidListView = <android.widget.ListView>tabView.items[0].view.nativeView;
270+
const androidListView = <android.widget.ListView>tabView.items[0].content.nativeView;
271271
// var viewPager: android.support.v4.view.ViewPager = (<any>tabView)._viewPager;
272272
// var androidListView = <android.widget.ListView>viewPager.getChildAt(0);
273273
var stackLayout = <org.nativescript.widgets.StackLayout>androidListView.getChildAt(0);

‎tests/app/ui/tabs/tabs-root-tests.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function createFrame(i: number, page: Page) {
3535
function createTabItem(i: number, frame: Frame) {
3636
const tabEntry = new TabContentItem();
3737
// tabEntry.title = "Tab " + i;
38-
tabEntry.view = frame;
38+
tabEntry.content = frame;
3939
tabEntry["index"] = i;
4040

4141
return tabEntry;

‎tests/app/ui/tabs/tabs-tests.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class TabsTest extends UITest<Tabs> {
2727
const label = new Label();
2828
label.text = "Tab " + i;
2929
const tabEntry = new TabContentItem();
30-
tabEntry.view = label;
30+
tabEntry.content = label;
3131
items.push(tabEntry);
3232
}
3333

@@ -210,7 +210,7 @@ export class TabsTest extends UITest<Tabs> {
210210
TKUnit.assertThrows(() => {
211211
let item = new TabContentItem();
212212
// item.title = "Tab 0";
213-
item.view = undefined;
213+
item.content = undefined;
214214
tabView.items = [item];
215215

216216
}, "Binding TabNavigation to a TabItem with undefined view should throw.");
@@ -223,7 +223,7 @@ export class TabsTest extends UITest<Tabs> {
223223
TKUnit.assertThrows(() => {
224224
let item = new TabContentItem();
225225
// item.title = "Tab 0";
226-
item.view = null;
226+
item.content = null;
227227
tabView.items = [item];
228228

229229
}, "Binding TabNavigation to a TabItem with null view should throw.");

0 commit comments

Comments
 (0)