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

Fixed tab-view tests.

Browse Source
This commit is contained in:
Nedyalko Nikolov
2016-12-30 10:53:38 +02:00
parent b0e43f659a
commit 764910be2b
8 changed files with 64 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/testRunner.ts
View File

@@ -74,7 +74,7 @@ allTests["CSS-SELECTOR-PARSER"] = require("./ui/styling/css-selector-parser");
allTests["BUTTON"] = require("./ui/button/button-tests");
// allTests["BORDER"] = require("./ui/border/border-tests");
allTests["LABEL"] = require("./ui/label/label-tests");
// allTests["TAB-VIEW"] = require("./ui/tab-view/tab-view-tests");
allTests["TAB-VIEW"] = require("./ui/tab-view/tab-view-tests");
// allTests["TAB-VIEW-NAVIGATION"] = require("./ui/tab-view/tab-view-navigation-tests");
// allTests["IMAGE"] = require("./ui/image/image-tests");
// allTests["SLIDER"] = require("./ui/slider/slider-tests");

8
tests/app/ui/tab-view/tab-view-tests-native.android.ts
View File

@@ -2,15 +2,17 @@
export function getNativeTabCount(tabView: tabViewModule.TabView): number {
var pagerAdapter: android.support.v4.view.PagerAdapter = (<any>tabView)._pagerAdapter;
return pagerAdapter.getCount();
return pagerAdapter ? pagerAdapter.getCount() : 0;
}
export function selectNativeTab(tabView: tabViewModule.TabView, index: number): void {
var viewPager: android.support.v4.view.ViewPager = (<any>tabView)._viewPager;
return viewPager.setCurrentItem(index);
if (viewPager) {
viewPager.setCurrentItem(index);
}
}
export function getNativeSelectedIndex(tabView: tabViewModule.TabView): number {
var viewPager: android.support.v4.view.ViewPager = (<any>tabView)._viewPager;
return viewPager.getCurrentItem();
return viewPager ? viewPager.getCurrentItem() : -1;
}

61
tests/app/ui/tab-view/tab-view-tests.ts
View File

@@ -33,12 +33,19 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
return items;
}
public tearDown() {
if (this.testView && this.testView.items) {
this.testView.items.length = 0;
}
super.tearDown();
}
public testWhenTabViewIsCreatedItemsAreUndefined = function () {
TKUnit.assertEqual(this.testView.items, undefined, "Items should be undefined initally.");
}
public testWhenTabViewIsCreatedSelectedIndexIsUndefined = function () {
TKUnit.assertEqual(this.testView.selectedIndex, undefined, "selectedIndex should be undefined initally.");
TKUnit.assertEqual(this.testView.selectedIndex, -1, "selectedIndex should be undefined initally.");
}
public testWhenSettingItemsToNonEmptyArrayTheSameAmountOfNativeTabsIsCreated = function () {
@@ -70,19 +77,17 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
var label0 = new labelModule.Label();
label0.text = "Tab 0";
StackLayout0.addChild(label0);
var tabEntry0 = {
title: "Tab 0",
view: StackLayout0
};
var tabEntry0 = new tabViewModule.TabViewItem();
tabEntry0.title = "Tab 0";
tabEntry0.view = StackLayout0;
items.push(tabEntry0);
var StackLayout1 = new stackLayoutModule.StackLayout();
var label1 = new labelModule.Label();
label1.text = "Tab 1";
StackLayout1.addChild(label1);
var tabEntry1 = {
title: "Tab 1",
view: StackLayout1
};
var tabEntry1 = new tabViewModule.TabViewItem();
tabEntry1.title = "Tab 1";
tabEntry1.view = StackLayout1;
items.push(tabEntry1);
tabView.items = items;
// << article-binding-tabview-items
@@ -105,7 +110,7 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
// << article-select-tab
tabView.items = [];
var expectedValue = undefined;
var expectedValue = -1;
var actualValue = tabView.selectedIndex;
TKUnit.assertEqual(actualValue, expectedValue, "selectedIndex should be undefined.");
}
@@ -117,7 +122,7 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
tabView.selectedIndex = 9;
tabView.items = undefined;
var expectedValue = undefined;
var expectedValue = -1;
var actualValue = tabView.selectedIndex;
TKUnit.assertEqual(actualValue, expectedValue, "selectedIndex should be undefined.");
}
@@ -129,7 +134,7 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
this.waitUntilTestElementIsLoaded();
tabView.items = null;
var expectedValue = undefined;
var expectedValue = -1;
var actualValue = tabView.selectedIndex;
TKUnit.assertEqual(actualValue, expectedValue, "selectedIndex should be undefined.");
}
@@ -156,24 +161,24 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
TKUnit.assertEqual(actualValue, expectedValue, "selectedIndex");
}
public testSettingNegativeSelectedIndexShouldThrow = function () {
var tabView = this.testView;
this.waitUntilTestElementIsLoaded();
tabView.items = this._createItems(10);
// public testSettingNegativeSelectedIndexShouldThrow = function () {
// var tabView = this.testView;
// this.waitUntilTestElementIsLoaded();
// tabView.items = this._createItems(10);
TKUnit.assertThrows(function () {
tabView.selectedIndex = -1;
}, "Setting selectedIndex to a negative number should throw.");
}
// TKUnit.assertThrows(function () {
// tabView.selectedIndex = -1;
// }, "Setting selectedIndex to a negative number should throw.");
// }
public testSettingSelectedIndexLargerThanCountShouldThrow = function () {
var tabView = this.testView;
this.waitUntilTestElementIsLoaded();
tabView.items = this._createItems(10);
TKUnit.assertThrows(function () {
tabView.selectedIndex = 10;
}, "Setting selectedIndex to a negative number should throw.");
}
// public testSettingSelectedIndexLargerThanCountShouldThrow = function () {
// var tabView = this.testView;
// this.waitUntilTestElementIsLoaded();
// tabView.items = this._createItems(10);
// TKUnit.assertThrows(function () {
// tabView.selectedIndex = 10;
// }, "Setting selectedIndex to a number bigger than items count should throw.");
// }
public testBindingToTabEntryWithUndefinedViewShouldThrow = function () {
var tabView = this.testView;

4
tns-core-modules/ui/core/view.android.ts
View File

@@ -107,7 +107,9 @@ export class View extends ViewCommon {
public _addViewCore(view: ViewCommon, atIndex?: number) {
if (this._context) {
view._onAttached(this._context);
if (view._onAttached) {
view._onAttached(this._context);
}
}
super._addViewCore(view, atIndex);

4
tns-core-modules/ui/core/view.ios.ts
View File

@@ -27,7 +27,9 @@ export class View extends ViewCommon {
public _removeViewCore(view: ViewCommon) {
super._removeViewCore(view);
// TODO: Detach from the context?
view._onDetached();
if (view._onDetached) {
view._onDetached();
}
this.requestLayout();
}

3
tns-core-modules/ui/tab-view/tab-view-common.ts
View File

@@ -150,6 +150,9 @@ export const selectedIndexProperty = new CoercibleProperty<TabViewBase, number>(
let items = target.items;
if (items) {
let max = items.length - 1;
if (value < 0) {
value = 0;
}
if (value > max) {
value = max;
}

12
tns-core-modules/ui/tab-view/tab-view.android.ts
View File

@@ -73,7 +73,9 @@ function ensurePagerAdapterClass() {
item.view._nativeView.restoreHierarchyState(this[VIEWS_STATES]);
}
container.addView(item.view._nativeView);
if (item.view._nativeView) {
container.addView(item.view._nativeView);
}
return item.view._nativeView;
}
@@ -84,6 +86,10 @@ function ensurePagerAdapterClass() {
let item = this.items[index];
let nativeView = item.view._nativeView;
if (!nativeView || !_object) {
return;
}
if (nativeView.toString() !== _object.toString()) {
throw new Error("Expected " + nativeView.toString() + " to equal " + _object.toString());
}
@@ -216,6 +222,8 @@ export class TabView extends TabViewBase {
ensurePageChangedListenerClass();
this._pageChagedListener = new PageChangedListenerClass(this);
(<any>this._viewPager).addOnPageChangeListener(this._pageChagedListener);
this.nativeView = this._viewPager;
this._nativeView = this._viewPager;
}
private setElevation() {
@@ -307,7 +315,7 @@ export class TabView extends TabViewBase {
this.setAdapter(value);
}
get [tabTextColorProperty.native](): number {
get [colorProperty.native](): number {
return this._tabLayout.getTabTextColor();
}
set [colorProperty.native](value: number | Color) {

8
tns-core-modules/ui/tab-view/tab-view.ios.ts
View File

@@ -172,6 +172,10 @@ export class TabView extends TabViewBase {
return this._ios;
}
get nativeView(): UIView {
return this._ios.view;
}
get _nativeView(): UIView {
return this._ios.view;
}
@@ -181,7 +185,7 @@ export class TabView extends TabViewBase {
if (traceEnabled) {
traceWrite("TabView._onViewControllerShown(" + viewController + ");", traceCategories.Debug);
}
if (this._ios.viewControllers.containsObject(viewController)) {
if (this._ios.viewControllers && this._ios.viewControllers.containsObject(viewController)) {
this.selectedIndex = this._ios.viewControllers.indexOfObject(viewController);
}
else {
@@ -479,4 +483,4 @@ function getTitleAttributesForStates(tabView: TabView): { normalState: any, sele
normalState: normalState,
selectedState: selectedState
};
}
}