diff --git a/tests/app/ui/frame/frame-tests.d.ts b/tests/app/ui/frame/frame-tests.d.ts index 796d8131e..3c09554ed 100644 --- a/tests/app/ui/frame/frame-tests.d.ts +++ b/tests/app/ui/frame/frame-tests.d.ts @@ -1,4 +1,3 @@ /* tslint:disable */ //@private -import * as android from "./frame-tests.android"; -import * as iOS from "./frame-tests.ios"; \ No newline at end of file +import * as android from "./frame-tests.android"; \ No newline at end of file diff --git a/tests/app/ui/page/page-tests.ios.ts b/tests/app/ui/page/page-tests.ios.ts index a4573a772..c1467f22e 100644 --- a/tests/app/ui/page/page-tests.ios.ts +++ b/tests/app/ui/page/page-tests.ios.ts @@ -187,7 +187,6 @@ export function test_correct_layout_scrollable_content_true_flat_action_bar() { TKUnit.assertEqual(contentHeight, expectedLabelHeight, "lbl.height !== screenHeight - statusBar - navBarHeight - tabBarHeight"); } - export function test_correct_layout_scrollable_content_true_flat_action_bar_edges_span_under_opaque_bars() { const page = new Page(); (page).scrollableContent = true; diff --git a/tests/app/ui/tab-view/tab-view-tests.ts b/tests/app/ui/tab-view/tab-view-tests.ts index a1c91c4a4..3a3aea028 100644 --- a/tests/app/ui/tab-view/tab-view-tests.ts +++ b/tests/app/ui/tab-view/tab-view-tests.ts @@ -168,17 +168,6 @@ export class TabViewTest extends UITest { TKUnit.assertEqual(actualValue, expectedValue, "selectedIndex"); } - public testSettingNegativeSelectedIndexShouldThrow() { - var tabView = this.testView; - tabView.items = this._createItems(3); - this.waitUntilTestElementIsLoaded(); - - tabView.items.forEach((item, index, array) => { - const expected = index === tabView.selectedIndex; - TKUnit.assertEqual(item.isLoaded, expected); - }); - } - public testBindingToTabEntryWithUndefinedViewShouldThrow = function () { var tabView = this.testView; this.waitUntilTestElementIsLoaded(); diff --git a/tests/package.json b/tests/package.json index 075dfe468..dad1fda17 100644 --- a/tests/package.json +++ b/tests/package.json @@ -6,10 +6,10 @@ "nativescript": { "id": "org.nativescript.UnitTestApp", "tns-ios": { - "version": "3.1.0" + "version": "3.2.0" }, "tns-android": { - "version": "3.1.1" + "version": "3.2.0" } }, "dependencies": { diff --git a/tns-core-modules/ui/tab-view/tab-view.android.ts b/tns-core-modules/ui/tab-view/tab-view.android.ts index f1dd51b1e..5fa70bf55 100644 --- a/tns-core-modules/ui/tab-view/tab-view.android.ts +++ b/tns-core-modules/ui/tab-view/tab-view.android.ts @@ -350,18 +350,6 @@ export class TabView extends TabViewBase { super.disposeNativeView(); } - public _loadEachChild(): void { - // We load childs once they are added to native parent or Frame - // cannot navigate because its nativeView is not added to window. - const index = this.selectedIndex; - if (index >= 0) { - const item = this.items[index]; - if (!item.isLoaded && this.isLoaded) { - item.onLoaded(); - } - } - } - private setAdapterItems(items: Array) { (this._pagerAdapter).items = items; @@ -405,19 +393,12 @@ export class TabView extends TabViewBase { this._viewPager.setOffscreenPageLimit(value); } - [selectedIndexProperty.getDefault](): number { - return -1; - } [selectedIndexProperty.setNative](value: number) { if (traceEnabled()) { traceWrite("TabView this._viewPager.setCurrentItem(" + value + ", true);", traceCategory); } - const item = this.items[value]; this._viewPager.setCurrentItem(value, true); - if (!item.isLoaded && this.isLoaded) { - item.onLoaded(); - } } [itemsProperty.getDefault](): TabViewItem[] { diff --git a/tns-core-modules/ui/tab-view/tab-view.ios.ts b/tns-core-modules/ui/tab-view/tab-view.ios.ts index 3da8462c5..81be720c3 100644 --- a/tns-core-modules/ui/tab-view/tab-view.ios.ts +++ b/tns-core-modules/ui/tab-view/tab-view.ios.ts @@ -356,9 +356,6 @@ export class TabView extends TabViewBase { } } - [selectedIndexProperty.getDefault](): number { - return -1; - } [selectedIndexProperty.setNative](value: number) { if (traceEnabled()) { traceWrite("TabView._onSelectedIndexPropertyChangedSetNativeValue(" + value + ")", traceCategories.Debug);