javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2999 from NativeScript/zhecheva/margin-test

Browse Source 
Fixed Percent margin test on IOS
This commit is contained in:
Maya Zhecheva
2016-11-01 16:42:28 +02:00
committed by GitHub
parent 20c987d7dc c3ec836d31
commit d045306a2c
5 changed files with 174 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tests/app/ui/frame/frame-tests-common.ts Normal file
View File

@ -0,0 +1,43 @@
// >> frame-require
import frameModule = require("ui/frame");
var topmost = frameModule.topmost();
// << frame-require
import labelModule = require("ui/label");
import pagesModule = require("ui/page");
export var ignore_test_DummyTestForSnippetOnly0 = function () {
// >> frame-navigating
topmost.navigate("details-page");
// << frame-navigating
}
export var ignore_test_DummyTestForSnippetOnly1 = function () {
// >> frame-factory-func
var factoryFunc = function () {
var label = new labelModule.Label();
label.text = "Hello, world!";
var page = new pagesModule.Page();
page.content = label;
return page;
};
topmost.navigate(factoryFunc);
// <<frame-factory-func
}
export var ignore_test_DummyTestForSnippetOnly2 = function () {
// >> frame-naventry
var navigationEntry = {
moduleName: "details-page",
context: { info: "something you want to pass to your page" },
animated: false
};
topmost.navigate(navigationEntry);
// << frame-naventry
}
export var ignore_test_DummyTestForSnippetOnly3 = function () {
// >> frame-back
topmost.goBack();
// << frame-back
}

64
tests/app/ui/frame/frame-tests.android.ts Normal file
View File

@ -0,0 +1,64 @@
import frameModule = require("ui/frame");
import TKUnit = require("../../TKUnit");
import { widthProperty, heightProperty } from "ui/styling/style";
export function test_percent_width_and_height_set_to_page_support() {
let topFrame = frameModule.topmost();
let currentPage = topFrame.currentPage;
(<any>currentPage).width = "50%";
(<any>currentPage).height = "50%";
TKUnit.waitUntilReady(() => {
return currentPage.isLayoutValid;
}, 1);
let topFrameWidth = topFrame.getMeasuredWidth();
let topFrameHeight = topFrame.getMeasuredHeight();
let currentPageWidth = currentPage.getMeasuredWidth();
let currentPageHeight = currentPage.getMeasuredHeight();
TKUnit.assertEqual(currentPageWidth, Math.floor(topFrameWidth / 2), "Current page measuredWidth incorrect");
TKUnit.assertEqual(currentPageHeight, Math.floor(topFrameHeight / 2), "Current page measuredHeight incorrect");
//reset values.
(<any>currentPage.style)._resetValue(heightProperty);
(<any>currentPage.style)._resetValue(widthProperty);
TKUnit.assert(isNaN(currentPage.width), "width");
TKUnit.assert(isNaN(currentPage.height), "height");
}
export function test_percent_margin_set_to_page_support() {
let topFrame = frameModule.topmost();
let currentPage = topFrame.currentPage;
currentPage.margin = "10%";
TKUnit.waitUntilReady(() => {
return currentPage.isLayoutValid;
}, 1);
let topFrameWidth = topFrame.getMeasuredWidth();
let topFrameHeight = topFrame.getMeasuredHeight();
let currentPageWidth = currentPage.getMeasuredWidth();
let currentPageHeight = currentPage.getMeasuredHeight()
let marginLeft = topFrameWidth * 0.1;
let marginTop = topFrameHeight * 0.1;
let bounds = currentPage._getCurrentLayoutBounds();
TKUnit.assertEqual(bounds.left, Math.round(marginLeft), "Current page LEFT position incorrect");
TKUnit.assertEqual(bounds.top, Math.round(marginTop), "Current page TOP position incorrect");
TKUnit.assertEqual(bounds.right, Math.round(marginLeft + currentPageWidth), "Current page RIGHT position incorrect");
TKUnit.assertEqual(bounds.bottom, Math.round(marginTop + currentPageHeight), "Current page BOTTOM position incorrect");
//reset values.
currentPage.margin = "0";
TKUnit.assertEqual(currentPage.marginLeft, 0, "marginLeft");
TKUnit.assertEqual(currentPage.marginTop, 0, "marginTop");
TKUnit.assertEqual(currentPage.marginRight, 0, "marginRight");
TKUnit.assertEqual(currentPage.marginBottom, 0, "marginBottom");
}

65
tests/app/ui/frame/frame-tests.ios.ts Normal file
View File

@ -0,0 +1,65 @@
import frameModule = require("ui/frame");
import TKUnit = require("../../TKUnit");
import { widthProperty, heightProperty } from "ui/styling/style";
var uiUtils = require("ui/utils");
export function test_percent_width_and_height_set_to_page_support() {
let topFrame = frameModule.topmost();
let currentPage = topFrame.currentPage;
(<any>currentPage).width = "50%";
(<any>currentPage).height = "50%";
TKUnit.waitUntilReady(() => {
return currentPage.isLayoutValid;
}, 1);
let topFrameWidth = topFrame.getMeasuredWidth();
let topFrameHeight = topFrame.getMeasuredHeight();
let currentPageWidth = currentPage.getMeasuredWidth();
let currentPageHeight = currentPage.getMeasuredHeight();
TKUnit.assertEqual(currentPageWidth, Math.round(topFrameWidth / 2), "Current page measuredWidth incorrect");
TKUnit.assertEqual(currentPageHeight, Math.round(topFrameHeight / 2), "Current page measuredHeight incorrect");
//reset values.
(<any>currentPage.style)._resetValue(heightProperty);
(<any>currentPage.style)._resetValue(widthProperty);
TKUnit.assert(isNaN(currentPage.width), "width");
TKUnit.assert(isNaN(currentPage.height), "height");
}
export function test_percent_margin_set_to_page_support() {
let topFrame = frameModule.topmost();
let currentPage = topFrame.currentPage;
currentPage.margin = "10%";
TKUnit.waitUntilReady(() => {
return currentPage.isLayoutValid;
}, 1);
let topFrameWidth = topFrame.getMeasuredWidth();
let topFrameHeight = topFrame.getMeasuredHeight();
let currentPageWidth = currentPage.getMeasuredWidth();
let currentPageHeight = currentPage.getMeasuredHeight()
let marginLeft = topFrameWidth * 0.1;
let marginTop = topFrameHeight * 0.1 + uiUtils.ios.getStatusBarHeight();
let bounds = currentPage._getCurrentLayoutBounds();
TKUnit.assertEqual(bounds.left, Math.round(marginLeft), "Current page LEFT position incorrect");
TKUnit.assertEqual(bounds.top, Math.round(marginTop), "Current page TOP position incorrect");
TKUnit.assertEqual(bounds.right, Math.round(marginLeft + currentPageWidth), "Current page RIGHT position incorrect");
TKUnit.assertEqual(bounds.bottom, Math.round(marginTop + currentPageHeight), "Current page BOTTOM position incorrect");
//reset values.
currentPage.margin = "0";
TKUnit.assertEqual(currentPage.marginLeft, 0, "marginLeft");
TKUnit.assertEqual(currentPage.marginTop, 0, "marginTop");
TKUnit.assertEqual(currentPage.marginRight, 0, "marginRight");
TKUnit.assertEqual(currentPage.marginBottom, 0, "marginBottom");
}

128
tests/app/ui/frame/frame-tests.ts
View File

@ -1,128 +0,0 @@
// >> frame-require
import frameModule = require("ui/frame");
var topmost = frameModule.topmost();
// << frame-require
import platform = require("platform");
import labelModule = require("ui/label");
import pagesModule = require("ui/page");
import testModule = require("../../ui-test");
import TKUnit = require("../../TKUnit");
import {widthProperty, heightProperty} from "ui/styling/style"
var uiUtils;
if (platform.isIOS) {
uiUtils = require("ui/utils");
}
export class FrameTest extends testModule.UITest<frameModule.Frame> {
public create(): frameModule.Frame {
return new frameModule.Frame();
}
public test_percent_width_and_height_set_to_page_support() {
let topFrame = frameModule.topmost();
let currentPage = topFrame.currentPage;
(<any>currentPage).width = "50%";
(<any>currentPage).height = "50%";
this.waitUntilTestElementLayoutIsValid();
let topFrameWidth = topFrame.getMeasuredWidth();
let topFrameHeight = topFrame.getMeasuredHeight();
let currentPageWidth = currentPage.getMeasuredWidth();
let currentPageHeight = currentPage.getMeasuredHeight()
TKUnit.assertEqual(currentPageWidth, Math.round(topFrameWidth / 2), "Current page MeasuredWidth incorrect");
TKUnit.assertEqual(currentPageHeight, Math.round(topFrameHeight / 2), "Current page MeasuredHeight incorrect");
//reset values.
(<any>currentPage.style)._resetValue(heightProperty);
(<any>currentPage.style)._resetValue(widthProperty);
TKUnit.assert(isNaN(currentPage.width), "width");
TKUnit.assert(isNaN(currentPage.height), "height");
}
public test_percent_margin_set_to_page_support() {
let topFrame = frameModule.topmost();
let currentPage = topFrame.currentPage;
currentPage.margin = "10%";
this.waitUntilTestElementLayoutIsValid();
let topFrameWidth = topFrame.getMeasuredWidth();
let topFrameHeight = topFrame.getMeasuredHeight();
let currentPageWidth = currentPage.getMeasuredWidth();
let currentPageHeight = currentPage.getMeasuredHeight()
let marginLeft = topFrameWidth * 0.1;
let marginTop;
if (uiUtils) {
marginTop = topFrameHeight * 0.1 + uiUtils.ios.getStatusBarHeight();
} else {
marginTop = topFrameHeight * 0.1;
}
let bounds = currentPage._getCurrentLayoutBounds();
TKUnit.assertEqual(bounds.left, Math.round(marginLeft), "Current page LEFT position incorrect");
TKUnit.assertEqual(bounds.top, Math.round(marginTop), "Current page TOP position incorrect");
TKUnit.assertEqual(bounds.right, Math.round(marginLeft + currentPageWidth), "Current page RIGHT position incorrect");
TKUnit.assertEqual(bounds.bottom, Math.round(marginTop + currentPageHeight), "Current page BOTTOM position incorrect");
//reset values.
currentPage.margin = "0";
TKUnit.assertEqual(currentPage.marginLeft, 0, "marginLeft");
TKUnit.assertEqual(currentPage.marginTop, 0, "marginTop");
TKUnit.assertEqual(currentPage.marginRight, 0, "marginRight");
TKUnit.assertEqual(currentPage.marginBottom, 0, "marginBottom");
}
}
export var ignore_test_DummyTestForSnippetOnly0 = function () {
// >> frame-navigating
topmost.navigate("details-page");
// << frame-navigating
}
export var ignore_test_DummyTestForSnippetOnly1 = function () {
// >> frame-factory-func
var factoryFunc = function () {
var label = new labelModule.Label();
label.text = "Hello, world!";
var page = new pagesModule.Page();
page.content = label;
return page;
};
topmost.navigate(factoryFunc);
// <<frame-factory-func
}
export var ignore_test_DummyTestForSnippetOnly2 = function () {
// >> frame-naventry
var navigationEntry = {
moduleName: "details-page",
context: { info: "something you want to pass to your page" },
animated: false
};
topmost.navigate(navigationEntry);
// << frame-naventry
}
export var ignore_test_DummyTestForSnippetOnly3 = function () {
// >> frame-back
topmost.goBack();
// << frame-back
}
export function createTestCase(): FrameTest {
return new FrameTest();
}

6
tests/app/ui/page/page-tests-common.ts
View File

@ -20,7 +20,7 @@ import observable = require("data/observable");
import {Page, ShownModallyData, NavigatedData} from "ui/page";
import {Label} from "ui/label";
import {EventData} from "data/observable";
import {widthProperty} from "ui/styling/style"
import {widthProperty, heightProperty} from "ui/styling/style"
import platform = require("platform");
export function addLabelToPage(page: Page, text?: string) {
@ -554,10 +554,8 @@ export function test_percent_width_and_height_support() {
TKUnit.assertEqual(pageHeight, Math.round(pageHeight / 2), "Current page MeasuredHeight incorrect");
//reset values.
testPage.height = Number.NaN;
(<any>testPage.style)._resetValue(heightProperty);
(<any>testPage.style)._resetValue(widthProperty);
testPage.height = Number.NaN;
TKUnit.assert(isNaN(testPage.width), "width");
TKUnit.assert(isNaN(testPage.height), "height");