javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix merge issue

Browse Source
This commit is contained in:
hshristov
2015-10-15 09:29:39 +03:00
parent a3c70b5e28
commit 4a594ddb95
1 changed files with 71 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,65 +25,62 @@ import scrollViewModule = require("ui/scroll-view");
// </snippet> // </snippet>
var ASYNC = 0.3; class ScrollLayoutTest extends testModule.UITest<scrollViewModule.ScrollView> {
var tmp: buttonModule.Button;
var newPage: page.Page;
public create(): scrollViewModule.ScrollView { public create(): scrollViewModule.ScrollView {
return new scrollViewModule.ScrollView(); return new scrollViewModule.ScrollView();
} }
public test_snippets() { public test_snippets() {
// <snippet module="ui/scroll-view" title="scroll-view"> // <snippet module="ui/scroll-view" title="scroll-view">
// ### Creating a ScrollView // ### Creating a ScrollView
// ``` JavaScript // ``` JavaScript
var scrollView = new scrollViewModule.ScrollView(); var scrollView = new scrollViewModule.ScrollView();
// ``` // ```
// </snippet> // </snippet>
} }
public test_default_TNS_values() { public test_default_TNS_values() {
TKUnit.assertEqual(this.testView.orientation, enums.Orientation.vertical, "Default this.testView.orientation"); TKUnit.assertEqual(this.testView.orientation, enums.Orientation.vertical, "Default this.testView.orientation");
TKUnit.assertEqual(this.testView.verticalOffset, 0, "Default this.testView.verticalOffset"); TKUnit.assertEqual(this.testView.verticalOffset, 0, "Default this.testView.verticalOffset");
TKUnit.assertEqual(this.testView.horizontalOffset, 0, "Default this.testView.horizontalOffset"); TKUnit.assertEqual(this.testView.horizontalOffset, 0, "Default this.testView.horizontalOffset");
} }
public test_vertical_oriantation_creates_correct_native_view() { public test_vertical_oriantation_creates_correct_native_view() {
this.testView.orientation = enums.Orientation.vertical; this.testView.orientation = enums.Orientation.vertical;
if (app.android) { if (app.android) {
TKUnit.assert(this.testView.android instanceof org.nativescript.widgets.VerticalScrollView, "android property should be instanceof org.nativescript.widgets.VerticalScrollView"); TKUnit.assert(this.testView.android instanceof org.nativescript.widgets.VerticalScrollView, "android property should be instanceof org.nativescript.widgets.VerticalScrollView");
} }
else if (app.ios) { else if (app.ios) {
TKUnit.assert(this.testView.ios instanceof UIScrollView, "ios property is UIScrollView"); TKUnit.assert(this.testView.ios instanceof UIScrollView, "ios property is UIScrollView");
}
} }
}
public test_horizontal_oriantation_creates_correct_native_view() { public test_horizontal_oriantation_creates_correct_native_view() {
this.testView.orientation = enums.Orientation.horizontal; this.testView.orientation = enums.Orientation.horizontal;
if (app.android) { if (app.android) {
TKUnit.assert(this.testView.android instanceof org.nativescript.widgets.HorizontalScrollView, "android property should be instanceof org.nativescript.widgets.HorizontalScrollView"); TKUnit.assert(this.testView.android instanceof org.nativescript.widgets.HorizontalScrollView, "android property should be instanceof org.nativescript.widgets.HorizontalScrollView");
} }
else if (app.ios) { else if (app.ios) {
TKUnit.assert(this.testView.ios instanceof UIScrollView, "ios property is UIScrollView"); TKUnit.assert(this.testView.ios instanceof UIScrollView, "ios property is UIScrollView");
}
} }
}
public test_scrollabeHeight_vertical_orientation_when_content_is_small() { public test_scrollabeHeight_vertical_orientation_when_content_is_small() {
this.testView.orientation = enums.Orientation.vertical; this.testView.orientation = enums.Orientation.vertical;
this.testView.width = 200; this.testView.width = 200;
this.testView.height = 300; this.testView.height = 300;
var btn = new button.Button(); let btn = new button.Button();
btn.text = "test"; btn.text = "test";
btn.height = 100; btn.height = 100;
this.testView.content = btn; this.testView.content = btn;
this.waitUntilTestElementLayoutIsValid(); this.waitUntilTestElementLayoutIsValid();
TKUnit.assertEqual(this.testView.scrollableHeight, 0, "this.testView.scrollableHeight"); TKUnit.assertEqual(this.testView.scrollableHeight, 0, "this.testView.scrollableHeight");
TKUnit.assertEqual(this.testView.scrollableWidth, 0, "this.testView.scrollableWidth"); TKUnit.assertEqual(this.testView.scrollableWidth, 0, "this.testView.scrollableWidth");
} }
public test_scrollabeHeight_vertical_orientation_when_content_is_big() { public test_scrollabeHeight_vertical_orientation_when_content_is_big() {
this.testView.orientation = enums.Orientation.vertical; this.testView.orientation = enums.Orientation.vertical;
@ -91,31 +88,31 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200; this.testView.width = 200;
this.testView.height = 300; this.testView.height = 300;
var btn = new button.Button(); let btn = new button.Button();
btn.text = "test"; btn.text = "test";
btn.height = 500; btn.height = 500;
this.testView.content = btn; this.testView.content = btn;
this.waitUntilTestElementLayoutIsValid(); this.waitUntilTestElementLayoutIsValid();
TKUnit.assertAreClose(this.testView.scrollableHeight, 200, 0.4, "this.testView.scrollableHeight"); TKUnit.assertAreClose(this.testView.scrollableHeight, 200, 0.4, "this.testView.scrollableHeight");
TKUnit.assertEqual(this.testView.scrollableWidth, 0, "this.testView.scrollableWidth"); TKUnit.assertEqual(this.testView.scrollableWidth, 0, "this.testView.scrollableWidth");
} }
public test_scrollabeWidth_horizontal_orientation_when_content_is_small() { public test_scrollabeWidth_horizontal_orientation_when_content_is_small() {
this.testView.orientation = enums.Orientation.vertical; this.testView.orientation = enums.Orientation.vertical;
this.testView.width = 200; this.testView.width = 200;
this.testView.height = 300; this.testView.height = 300;
var btn = new button.Button(); let btn = new button.Button();
btn.text = "test"; btn.text = "test";
btn.width = 100; btn.width = 100;
this.testView.content = btn; this.testView.content = btn;
this.waitUntilTestElementLayoutIsValid(); this.waitUntilTestElementLayoutIsValid();
TKUnit.assertEqual(this.testView.scrollableHeight, 0, "this.testView.scrollableHeight"); TKUnit.assertEqual(this.testView.scrollableHeight, 0, "this.testView.scrollableHeight");
TKUnit.assertEqual(this.testView.scrollableWidth, 0, "this.testView.scrollableWidth"); TKUnit.assertEqual(this.testView.scrollableWidth, 0, "this.testView.scrollableWidth");
} }
public test_scrollabeWidth_horizontal_orientation_when_content_is_big() { public test_scrollabeWidth_horizontal_orientation_when_content_is_big() {
this.testView.orientation = enums.Orientation.horizontal; this.testView.orientation = enums.Orientation.horizontal;
@ -123,15 +120,15 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200; this.testView.width = 200;
this.testView.height = 300; this.testView.height = 300;
var btn = new button.Button(); let btn = new button.Button();
btn.text = "test"; btn.text = "test";
btn.width = 500; btn.width = 500;
this.testView.content = btn; this.testView.content = btn;
this.waitUntilTestElementLayoutIsValid(); this.waitUntilTestElementLayoutIsValid();
TKUnit.assertEqual(this.testView.scrollableHeight, 0, "this.testView.scrollableHeight"); TKUnit.assertEqual(this.testView.scrollableHeight, 0, "this.testView.scrollableHeight");
TKUnit.assertAreClose(this.testView.scrollableWidth, 300, 0.4, "this.testView.scrollableWidth"); TKUnit.assertAreClose(this.testView.scrollableWidth, 300, 0.4, "this.testView.scrollableWidth");
} }
public test_scrollToVerticalOffset_no_animation() { public test_scrollToVerticalOffset_no_animation() {
this.testView.orientation = enums.Orientation.vertical; this.testView.orientation = enums.Orientation.vertical;
@ -139,16 +136,16 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200; this.testView.width = 200;
this.testView.height = 300; this.testView.height = 300;
var btn = new button.Button(); let btn = new button.Button();
btn.text = "test"; btn.text = "test";
btn.height = 500; btn.height = 500;
this.testView.content = btn; this.testView.content = btn;
this.waitUntilTestElementLayoutIsValid(); this.waitUntilTestElementLayoutIsValid();
TKUnit.assertEqual(this.testView.verticalOffset, 0, "this.testView.verticalOffset"); TKUnit.assertEqual(this.testView.verticalOffset, 0, "this.testView.verticalOffset");
this.testView.scrollToVerticalOffset(100, false); this.testView.scrollToVerticalOffset(100, false);
TKUnit.assertAreClose(this.testView.verticalOffset, 100, 0.1, "this.testView.verticalOffset"); TKUnit.assertAreClose(this.testView.verticalOffset, 100, 0.1, "this.testView.verticalOffset");
} }
public test_scrollToVerticalOffset_with_animation() { public test_scrollToVerticalOffset_with_animation() {
this.testView.orientation = enums.Orientation.vertical; this.testView.orientation = enums.Orientation.vertical;
@ -156,23 +153,23 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200; this.testView.width = 200;
this.testView.height = 300; this.testView.height = 300;
var btn = new button.Button(); let btn = new button.Button();
btn.text = "test"; btn.text = "test";
btn.height = 500; btn.height = 500;
this.testView.content = btn; this.testView.content = btn;
this.waitUntilTestElementLayoutIsValid(); this.waitUntilTestElementLayoutIsValid();
TKUnit.assertEqual(this.testView.verticalOffset, 0, "this.testView.verticalOffset"); TKUnit.assertEqual(this.testView.verticalOffset, 0, "this.testView.verticalOffset");
this.testView.scrollToVerticalOffset(100, true); this.testView.scrollToVerticalOffset(100, true);
// No synchronous change. // No synchronous change.
TKUnit.assertEqual(this.testView.verticalOffset, 0, "this.testView.verticalOffset"); TKUnit.assertEqual(this.testView.verticalOffset, 0, "this.testView.verticalOffset");
TKUnit.waitUntilReady(() => { return TKUnit.areClose(this.testView.verticalOffset, 100, 0.1); }); TKUnit.waitUntilReady(() => { return TKUnit.areClose(this.testView.verticalOffset, 100, 0.1); });
// The scrolling animation should be finished by now // The scrolling animation should be finished by now
TKUnit.assertAreClose(this.testView.verticalOffset, 100, 0.1, "this.testView.verticalOffset"); TKUnit.assertAreClose(this.testView.verticalOffset, 100, 0.1, "this.testView.verticalOffset");
} }
public test_scrollToHorizontalOffset_no_animation() { public test_scrollToHorizontalOffset_no_animation() {
this.testView.orientation = enums.Orientation.horizontal; this.testView.orientation = enums.Orientation.horizontal;
@ -180,16 +177,16 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200; this.testView.width = 200;
this.testView.height = 300; this.testView.height = 300;
var btn = new button.Button(); let btn = new button.Button();
btn.text = "test"; btn.text = "test";
btn.width = 500; btn.width = 500;
this.testView.content = btn; this.testView.content = btn;
this.waitUntilTestElementLayoutIsValid(); this.waitUntilTestElementLayoutIsValid();
TKUnit.assertEqual(this.testView.horizontalOffset, 0, "this.testView.horizontalOffset"); TKUnit.assertEqual(this.testView.horizontalOffset, 0, "this.testView.horizontalOffset");
this.testView.scrollToHorizontalOffset(100, false); this.testView.scrollToHorizontalOffset(100, false);
TKUnit.assertAreClose(this.testView.horizontalOffset, 100, 0.1, "this.testView.horizontalOffset"); TKUnit.assertAreClose(this.testView.horizontalOffset, 100, 0.1, "this.testView.horizontalOffset");
} }
public test_scrollToHorizontalOffset_with_animation() { public test_scrollToHorizontalOffset_with_animation() {
this.testView.orientation = enums.Orientation.horizontal; this.testView.orientation = enums.Orientation.horizontal;
@ -197,23 +194,23 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200; this.testView.width = 200;
this.testView.height = 300; this.testView.height = 300;
var btn = new button.Button(); let btn = new button.Button();
btn.text = "test"; btn.text = "test";
btn.width = 500; btn.width = 500;
this.testView.content = btn; this.testView.content = btn;
this.waitUntilTestElementLayoutIsValid(); this.waitUntilTestElementLayoutIsValid();
TKUnit.assertEqual(this.testView.horizontalOffset, 0, "this.testView.horizontalOffset"); TKUnit.assertEqual(this.testView.horizontalOffset, 0, "this.testView.horizontalOffset");
this.testView.scrollToHorizontalOffset(100, true); this.testView.scrollToHorizontalOffset(100, true);
// No synchronous change. // No synchronous change.
TKUnit.assertEqual(this.testView.horizontalOffset, 0, "this.testView.horizontalOffset"); TKUnit.assertEqual(this.testView.horizontalOffset, 0, "this.testView.horizontalOffset");
TKUnit.waitUntilReady(() => { return TKUnit.areClose(this.testView.horizontalOffset, 100, 0.1); }); TKUnit.waitUntilReady(() => { return TKUnit.areClose(this.testView.horizontalOffset, 100, 0.1); });
// The scrolling animation should be finished by now // The scrolling animation should be finished by now
TKUnit.assertAreClose(this.testView.horizontalOffset, 100, 0.1, "this.testView.horizontalOffset"); TKUnit.assertAreClose(this.testView.horizontalOffset, 100, 0.1, "this.testView.horizontalOffset");
} }
public test_scrollView_persistsState_vertical() { public test_scrollView_persistsState_vertical() {
this.testView.orientation = enums.Orientation.vertical; this.testView.orientation = enums.Orientation.vertical;
@ -221,9 +218,9 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200; this.testView.width = 200;
this.testView.height = 300; this.testView.height = 300;
var btn = new button.Button(); var btn = new button.Button();
btn.text = "test"; btn.text = "test";
btn.height = 500; btn.height = 500;
this.testView.content = btn; this.testView.content = btn;
this.waitUntilTestElementLayoutIsValid(); this.waitUntilTestElementLayoutIsValid();
@ -231,16 +228,16 @@ var scrollView = new scrollViewModule.ScrollView();
TKUnit.assertAreClose(this.testView.verticalOffset, 100, 0.1, "this.testView.verticalOffset before navigation"); TKUnit.assertAreClose(this.testView.verticalOffset, 100, 0.1, "this.testView.verticalOffset before navigation");
helper.do_PageTest_WithButton((t) => { helper.do_PageTest_WithButton((t) => {
// Just navigate forward and back. // Just navigate forward and back.
}); });
// Wait for the page to reload. // Wait for the page to reload.
TKUnit.waitUntilReady(() => { return TKUnit.areClose(this.testView.verticalOffset, 100, 0.1); }); TKUnit.waitUntilReady(() => { return TKUnit.areClose(this.testView.verticalOffset, 100, 0.1); });
// Check verticalOffset after navigation // Check verticalOffset after navigation
TKUnit.assertAreClose(this.testView.verticalOffset, 100, 0.1, "this.testView.verticalOffset after navigation"); TKUnit.assertAreClose(this.testView.verticalOffset, 100, 0.1, "this.testView.verticalOffset after navigation");
} }
public test_scrollView_persistsState_horizontal() { public test_scrollView_persistsState_horizontal() {
this.testView.orientation = enums.Orientation.horizontal; this.testView.orientation = enums.Orientation.horizontal;
@ -248,9 +245,9 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200; this.testView.width = 200;
this.testView.height = 300; this.testView.height = 300;
var btn = new button.Button(); var btn = new button.Button();
btn.text = "test"; btn.text = "test";
btn.width = 500; btn.width = 500;
this.testView.content = btn; this.testView.content = btn;
this.waitUntilTestElementLayoutIsValid(); this.waitUntilTestElementLayoutIsValid();
@ -258,14 +255,14 @@ var scrollView = new scrollViewModule.ScrollView();
TKUnit.assertAreClose(this.testView.horizontalOffset, 100, 0.1, "this.testView.horizontalOffset before navigation"); TKUnit.assertAreClose(this.testView.horizontalOffset, 100, 0.1, "this.testView.horizontalOffset before navigation");
helper.do_PageTest_WithButton((t) => { helper.do_PageTest_WithButton((t) => {
// Just navigate forward and back. // Just navigate forward and back.
}); });
// Wait for the page to reload. // Wait for the page to reload.
TKUnit.waitUntilReady(() => { return TKUnit.areClose(this.testView.horizontalOffset, 100, 0.1); }); TKUnit.waitUntilReady(() => { return TKUnit.areClose(this.testView.horizontalOffset, 100, 0.1); });
// Check verticalOffset after navigation // Check verticalOffset after navigation
TKUnit.assertAreClose(this.testView.horizontalOffset, 100, 0.1, "this.testView.horizontalOffset after navigation"); TKUnit.assertAreClose(this.testView.horizontalOffset, 100, 0.1, "this.testView.horizontalOffset after navigation");
} }
} }