diff --git a/apps/tests/layouts/grid-layout-tests.ts b/apps/tests/layouts/grid-layout-tests.ts index 301fa0dad..c2813e979 100644 --- a/apps/tests/layouts/grid-layout-tests.ts +++ b/apps/tests/layouts/grid-layout-tests.ts @@ -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; diff --git a/apps/tests/testRunner.ts b/apps/tests/testRunner.ts index b14b44bc1..734f09aee 100644 --- a/apps/tests/testRunner.ts +++ b/apps/tests/testRunner.ts @@ -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"); diff --git a/apps/tests/ui/list-view/list-view-tests.ts b/apps/tests/ui/list-view/list-view-tests.ts index 3b6db9736..0881b7901 100644 --- a/apps/tests/ui/list-view/list-view-tests.ts +++ b/apps/tests/ui/list-view/list-view-tests.ts @@ -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"); //  // # 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"]); diff --git a/apps/tests/ui/text-field/text-field-tests.ts b/apps/tests/ui/text-field/text-field-tests.ts index 637535aef..585a4da47 100644 --- a/apps/tests/ui/text-field/text-field-tests.ts +++ b/apps/tests/ui/text-field/text-field-tests.ts @@ -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"); // // # 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!"); }); -} +} \ No newline at end of file diff --git a/apps/tests/ui/text-view/text-view-tests.ts b/apps/tests/ui/text-view/text-view-tests.ts index 631088a61..4b57ebd72 100644 --- a/apps/tests/ui/text-view/text-view-tests.ts +++ b/apps/tests/ui/text-view/text-view-tests.ts @@ -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"); // // # 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!");