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

Fix WrapLayout

Browse Source 
Fix ScrollView
Fix Stylers.android
Remove some method from View class
Fix layout-helper test views
Fix all android failing tests
Remove onLayout on Button and TextBase
This commit is contained in:
hshristov
2015-07-30 17:27:35 +03:00
parent bd50fb5550
commit e58506563a
19 changed files with 280 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
apps/tests/layouts/stack-layout-tests.ts
View File

@@ -9,32 +9,9 @@ import utils = require("utils/utils");
var ASYNC = 2;
export class MyStackLayout extends StackLayout {
public measureCount: number = 0;
public arrangeCount: number = 0;
public get measured(): boolean {
return this.measureCount > 0;
}
public get arranged(): boolean {
return this.arrangeCount > 0;
}
public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
this.measureCount++;
}
public onLayout(left: number, top: number, right: number, bottom: number): void {
super.onLayout(left, top, right, bottom);
this.arrangeCount++;
}
}
var tmp: Button;
var newPage: Page;
var rootLayout: MyStackLayout;
var rootLayout: helper.MyStackLayout;
var btn1: helper.MyButton;
var btn2: helper.MyButton;
@@ -60,7 +37,7 @@ export function tearDownModule() {
}
export function setUp() {
rootLayout = new MyStackLayout();
rootLayout = new helper.MyStackLayout();
btn1 = new helper.MyButton();
btn1.text = "btn1";
rootLayout.addChild(btn1);
@@ -83,7 +60,7 @@ export function test_SetWrongOrientation_ShouldThrowError() {
"Setting invalid value for orientation should throw exception.");
}
export function test_StackLayout_Orientation_Change() {
export function test_Orientation_Change() {
TKUnit.waitUntilReady(function () {
return rootLayout.arranged;
@@ -102,7 +79,7 @@ export function test_StackLayout_Orientation_Change() {
TKUnit.assertEqual(rootLayout.arrangeCount, 2, "Orientation change should invalidate arrange.");
}
export function test_StackLayout_ShouldMeasureWith_AtMost_OnVertical() {
export function test_ShouldMeasureWith_AtMost_OnVertical() {
TKUnit.waitUntilReady(function () {
return btn1.isLayoutValid;
@@ -117,7 +94,7 @@ export function test_StackLayout_ShouldMeasureWith_AtMost_OnVertical() {
TKUnit.assertEqual(utils.layout.getMeasureSpecMode(specs.heightMeasureSpec), utils.layout.AT_MOST, "Layout should measure child with AT_MOST Height in vertical orientation.");
}
export function test_StackLayout_ShouldMeasureWith_AtMost_OnHorizontal() {
export function test_ShouldMeasureWith_AtMost_OnHorizontal() {
rootLayout.orientation = enums.Orientation.horizontal;
@@ -133,7 +110,7 @@ export function test_StackLayout_ShouldMeasureWith_AtMost_OnHorizontal() {
TKUnit.assertEqual(utils.layout.getMeasureSpecMode(specs.widthMeasureSpec), utils.layout.AT_MOST, "Layout should measure child with AT_MOST Width in horizontal orientation.");
}
export function test_StackLayout_DesiredSize_Vertical() {
export function test_DesiredSize_Vertical() {
rootLayout.verticalAlignment = enums.VerticalAlignment.top;
rootLayout.horizontalAlignment = enums.HorizontalAlignment.left;
@@ -145,7 +122,7 @@ export function test_StackLayout_DesiredSize_Vertical() {
TKUnit.assertEqual(rootLayout.getMeasuredHeight(), (btn1.getMeasuredHeight() + btn2.getMeasuredHeight()), "Layout getMeasuredHeight should be Sum of children getMeasuredHeight");
}
export function test_StackLayout_DesiredSize_Horizontal() {
export function test_DesiredSize_Horizontal() {
rootLayout.horizontalAlignment = enums.HorizontalAlignment.left;
rootLayout.verticalAlignment = enums.VerticalAlignment.top;
@@ -159,7 +136,7 @@ export function test_StackLayout_DesiredSize_Horizontal() {
TKUnit.assertEqual(rootLayout.getMeasuredHeight(), Math.max(btn1.getMeasuredHeight(), btn2.getMeasuredHeight()), "Layout getMeasuredHeight should be Max of children getMeasuredHeight");
}
export function test_StackLayout_Padding_Vertical() {
export function test_Padding_Vertical() {
rootLayout.width = 300;
rootLayout.height = 300;
@@ -176,13 +153,13 @@ export function test_StackLayout_Padding_Vertical() {
}, ASYNC);
helper.assertMeasure(btn1, 260, 50);
helper.assertMeasure(btn1, 260, 50);
helper.assertMeasure(btn2, 260, 50);
helper.assertLayout(btn1, 10, 20, 260, 50, "btn1");
helper.assertLayout(btn2, 10, 70, 260, 50, "btn2");
}
export function test_StackLayout_Padding_Horizontal() {
export function test_Padding_Horizontal() {
rootLayout.width = 300;
rootLayout.height = 300;
rootLayout.orientation = enums.Orientation.horizontal;
@@ -200,7 +177,7 @@ export function test_StackLayout_Padding_Horizontal() {
}, ASYNC);
helper.assertMeasure(btn1, 50, 240);
helper.assertMeasure(btn1, 50, 240);
helper.assertMeasure(btn2, 50, 240);
helper.assertLayout(btn1, 10, 20, 50, 240, "btn1");
helper.assertLayout(btn2, 60, 20, 50, 240, "btn2");
@@ -266,4 +243,4 @@ export function test_codesnippets() {
// ```
// </snippet>
};
}