Let about 300 non UI tests run

This commit is contained in:
PanayotCankov
2016-12-21 11:38:03 +02:00
parent 2580dcf575
commit 185b84e0ba
7 changed files with 33 additions and 30 deletions

View File

@ -29,28 +29,29 @@ export function isRunningOnEmulator(): boolean {
export var allTests = {};
// allTests["PLATFORM"] = require("./platform-tests");
// allTests["FILE SYSTEM"] = require("./file-system-tests");
// allTests["HTTP"] = require("./http-tests");
// allTests["XHR"] = require("./xhr-tests");
// allTests["FETCH"] = require("./fetch-tests");
// allTests["APPLICATION SETTINGS"] = require("./application-settings-tests");
// allTests["APPLICATION"] = require("./application-tests");
// allTests["IMAGE SOURCE"] = require("./image-source-tests");
// allTests["OBSERVABLE-ARRAY"] = require("./data/observable-array-tests");
// allTests["VIRTUAL-ARRAY"] = require("./data/virtual-array-tests");
// allTests["OBSERVABLE"] = require("./data/observable-tests");
// allTests["TIMER"] = require("./timer-tests");
// allTests["COLOR"] = require("./color-tests");
// allTests["DEPENDENCY-OBSERVABLE"] = require("./ui/dependency-observable-tests");
allTests["PLATFORM"] = require("./platform-tests");
allTests["FILE SYSTEM"] = require("./file-system-tests");
allTests["HTTP"] = require("./http-tests");
allTests["XHR"] = require("./xhr-tests");
allTests["FETCH"] = require("./fetch-tests");
allTests["APPLICATION SETTINGS"] = require("./application-settings-tests");
allTests["APPLICATION"] = require("./application-tests");
allTests["IMAGE SOURCE"] = require("./image-source-tests");
allTests["OBSERVABLE-ARRAY"] = require("./data/observable-array-tests");
allTests["VIRTUAL-ARRAY"] = require("./data/virtual-array-tests");
allTests["OBSERVABLE"] = require("./data/observable-tests");
allTests["TIMER"] = require("./timer-tests");
allTests["COLOR"] = require("./color-tests");
allTests["DEPENDENCY-OBSERVABLE"] = require("./ui/dependency-observable-tests");
// allTests["BINDABLE"] = require("./ui/bindable-tests");
// allTests["BINDING-EXPRESSIONS"] = require("./ui/binding-expressions-tests");
// allTests["XML-PARSER"] = require("./xml-parser-tests/xml-parser-tests");
allTests["XML-PARSER"] = require("./xml-parser-tests/xml-parser-tests");
// allTests["FORMATTEDSTRING"] = require("./text/formatted-string-tests");
// allTests["FILE-SYSTEM-ACCESS"] = require("./file-system-access-tests/file-system-access-tests");
// allTests["FILE-NAME-RESOLVER"] = require("./file-name-resolver-tests/file-name-resolver-tests");
// allTests["WEAK-EVENTS"] = require("./weak-event-listener-tests");
// allTests["CONNECTIVITY"] = require("./connectivity-tests");
allTests["FILE-SYSTEM-ACCESS"] = require("./file-system-access-tests/file-system-access-tests");
allTests["FILE-NAME-RESOLVER"] = require("./file-name-resolver-tests/file-name-resolver-tests");
allTests["WEAK-EVENTS"] = require("./weak-event-listener-tests");
allTests["CONNECTIVITY"] = require("./connectivity-tests");
// allTests["PROXY-VIEW-CONTAINER"] = require("./ui/proxy-view-container/proxy-view-container-tests")
// allTests["SCROLL-VIEW"] = require("./ui/scroll-view/scroll-view-tests");

View File

@ -10,7 +10,7 @@ import {
} from "ui/layouts/flexbox-layout";
// << flexbox-layout-require
import {View, unsetValue, Length} from "ui/core/view";
import {View, unsetValue, Length, PercentLength} from "ui/core/view";
import {Label} from "ui/label";
import * as TKUnit from "../../TKUnit";
import * as helper from "../helper";
@ -1844,7 +1844,7 @@ export const testWrap_childMargin_horizontal = test(
({flexbox, text1, text2, text3}) => {
isBelow(text2, text1);
isRightOf(text3, text2);
closeEnough(height(flexbox), height(text1) + height(text2) + Length.toDevicePixels(text2.style.marginTop, 0) + Length.toDevicePixels(text2.style.marginBottom, 0));
closeEnough(height(flexbox), height(text1) + height(text2) + PercentLength.toDevicePixels(text2.style.marginTop, 0, Number.NaN) + PercentLength.toDevicePixels(text2.style.marginBottom, 0, Number.NaN));
}
);
@ -1907,7 +1907,7 @@ export const testWrap_childMargin_vertical = test(
isRightOf(text2, text1);
isBelow(text3, text2);
// dips anyone?
closeEnough(width(flexbox), width(text1) + width(text2) + Length.toDevicePixels(text2.marginLeft, 0) + Length.toDevicePixels(text2.marginRight, 0));
closeEnough(width(flexbox), width(text1) + width(text2) + PercentLength.toDevicePixels(text2.marginLeft, 0, Number.NaN) + PercentLength.toDevicePixels(text2.marginRight, 0, Number.NaN));
}
);

View File

@ -9,7 +9,7 @@
"version": "2.4.0"
},
"tns-android": {
"version": "2.4.0"
"version": "2.4.1"
}
},
"dependencies": {

View File

@ -542,7 +542,7 @@ interface NativePercentLengthPropertyOptions {
setPercent?: NativeSetter
}
function createNativePercentLengthProperty({key, auto = 0, getPixels, setPixels, setPercent = percentNotSupported}: NativePercentLengthPropertyOptions) {
Object.defineProperty(View, key, {
Object.defineProperty(View.prototype, key, {
get: function (this: View) { return { value: getPixels(this.nativeView), unit: "px" } },
set: function (this: View, length: PercentLength) {
if (length == "auto") {

View File

@ -104,10 +104,10 @@ declare module "ui/core/view" {
export function equals(a: Length, b: Length): boolean;
/**
* Converts Length unit to device pixels.
* @param length The PercentLength to convert.
* @param length The Length to convert.
* @param auto Value to use for conversion of "auto".
*/
export function toDevicePixels(length: PercentLength, auto: number): number;
export function toDevicePixels(length: Length, auto: number): number;
}
export type PercentLength = "auto" | number | {

View File

@ -3,6 +3,9 @@ import { View, layout, Property } from "ui/core/view";
export * from "ui/core/view";
// TODO: Can we use Label.ios optimization for affectsLayout???
export const htmlProperty = new Property<HtmlView, string>({ name: "html", defaultValue: "", affectsLayout: true });
export class HtmlView extends View implements HtmlViewDefinition {
private _ios: UITextView;
@ -70,6 +73,4 @@ export class HtmlView extends View implements HtmlViewDefinition {
}
}
// TODO: Can we use Label.ios optimization for affectsLayout???
export const htmlProperty = new Property<HtmlView, string>({ name: "html", defaultValue: "", affectsLayout: true });
htmlProperty.register(HtmlView);

View File

@ -6,6 +6,8 @@ import { File, knownFolders, path } from "file-system";
export { File, knownFolders, path };
export * from "ui/core/view";
export const srcProperty = new Property<WebViewBase, string>({ name: "url" });
export abstract class WebViewBase extends View implements WebViewDefinition {
public static loadStartedEvent = "loadStarted";
public static loadFinishedEvent = "loadFinished";
@ -103,5 +105,4 @@ export abstract class WebViewBase extends View implements WebViewDefinition {
}
}
export const srcProperty = new Property<WebViewBase, string>({ name: "url" });
srcProperty.register(WebViewBase);