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

Merge pull request #874 from NativeScript/nnikolov/iOS9Support

Browse Source 
Some tests removed for iOS9.
This commit is contained in:
Nedyalko Nikolov
2015-10-05 11:54:24 +03:00
parent 467918df66 f0d871a741
commit cbdde78d9a
5 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/tests/layouts/grid-layout-tests.ts
View File

@ -9,7 +9,7 @@ import utils = require("utils/utils");
import builder = require("ui/builder");
var ASYNC = 2;
var DELTA = 0.1;
var DELTA = 1;
export class MyGridLayout extends layout.GridLayout {
public measureCount: number = 0;

5
apps/tests/testRunner.ts
View File

@ -18,11 +18,13 @@ export function isRunningOnEmulator(): boolean {
android.os.Build.PRODUCT.toLocaleLowerCase().indexOf("emulator") > -1; // VS Emulator
}
else if (platform.device.os === platform.platformNames.ios) {
return platform.device.model === "iPhone Simulator";
//return platform.device.model === "iPhone Simulator";
return (__dirname.search("Simulator") > -1);
}
}
export var allTests = {};
allTests["SCROLL-VIEW"] = require("./ui/scroll-view/scroll-view-tests");
allTests["ACTION-BAR"] = require("./ui/action-bar/action-bar-tests");
allTests["XML-DECLARATION"] = require("./xml-declaration/xml-declaration-tests");
allTests["APPLICATION"] = require("./application-tests");
@ -33,7 +35,6 @@ allTests["GRIDLAYOUT"] = require("./layouts/grid-layout-tests");
allTests["STACKLAYOUT"] = require("./layouts/stack-layout-tests");
allTests["PLATFORM"] = require("./platform-tests");
allTests["STYLE-PROPERTIES"] = require("./ui/style/style-properties-tests");
allTests["SCROLL-VIEW"] = require("./ui/scroll-view/scroll-view-tests");
allTests["FILE SYSTEM"] = require("./file-system-tests");
allTests["HTTP"] = require("./http-tests");
allTests["XHR"] = require("./xhr-tests");

14
apps/tests/ui/list-view/list-view-tests.ts
View File

@ -1,4 +1,5 @@
import TKUnit = require("../../TKUnit");
import testRunner = require("../../testRunner");
import app = require("application");
import helper = require("../helper");
import viewModule = require("ui/core/view");
@ -6,7 +7,6 @@ import observable = require("data/observable");
import types = require("utils/types");
import platform = require("platform");
import utils = require("utils/utils");
import testRunner = require("../../testRunner");
// <snippet module="ui/list-view" title="list-view">
// # ListView
@ -634,8 +634,10 @@ export function test_ConverterIsCalledJustOnce_onAddingItemsToListView() {
}
export function test_no_memory_leak_when_items_is_regular_array() {
if (testRunner.isRunningOnEmulator()) {
return;
if (utils.ios) {
if (testRunner.isRunningOnEmulator() || utils.ios.MajorVersion > 8) {
return;
}
}
var createFunc = function (): listViewModule.ListView {
var listView = new listViewModule.ListView();
@ -649,8 +651,10 @@ export function test_no_memory_leak_when_items_is_regular_array() {
}
export function test_no_memory_leak_when_items_is_observable_array() {
if (testRunner.isRunningOnEmulator()) {
return;
if (utils.ios) {
if (testRunner.isRunningOnEmulator() || utils.ios.MajorVersion > 8) {
return;
}
}
// Keep the reference to the observable array to test the weakEventListener
var colors = new observableArray.ObservableArray(["red", "green", "blue"]);

9
apps/tests/ui/text-field/text-field-tests.ts
View File

@ -6,6 +6,7 @@ import pagesModule = require("ui/page");
import textFieldTestsNative = require("./text-field-tests-native");
import colorModule = require("color");
import enums = require("ui/enums");
import utils = require("utils/utils");
// <snippet module="ui/text-field" title="TextField">
// # TextField
@ -428,10 +429,12 @@ export var testNativeTextAlignmentFromLocal = function () {
}
export var testMemoryLeak = function () {
if (testRunner.isRunningOnEmulator()) {
return;
if (utils.ios) {
if (testRunner.isRunningOnEmulator() || utils.ios.MajorVersion > 8) {
return;
}
}
helper.buildUIWithWeakRefAndInteract(_createTextFieldFunc, function (textField) {
textFieldTestsNative.typeTextNatively(textField, "Hello, world!");
});
}
}

7
apps/tests/ui/text-view/text-view-tests.ts
View File

@ -6,6 +6,7 @@ import pagesModule = require("ui/page");
import textViewTestsNative = require("./text-view-tests-native");
import colorModule = require("color");
import enums = require("ui/enums");
import utils = require("utils/utils");
// <snippet module="ui/text-view" title="TextView">
// # TextView
@ -469,8 +470,10 @@ export var testNativeTextAlignmentFromLocal = function () {
}
export var testMemoryLeak = function () {
if (testRunner.isRunningOnEmulator()) {
return;
if (utils.ios) {
if (testRunner.isRunningOnEmulator() || utils.ios.MajorVersion > 8) {
return;
}
}
helper.buildUIWithWeakRefAndInteract(_createTextViewFunc, function (textView) {
textViewTestsNative.typeTextNatively(textView, "Hello, world!");