diff --git a/apps/app/ui-tests-app/perf/memory-leaks/main-page.ts b/apps/app/ui-tests-app/perf/memory-leaks/main-page.ts index 0113d4cf3..3b45ab3ec 100644 --- a/apps/app/ui-tests-app/perf/memory-leaks/main-page.ts +++ b/apps/app/ui-tests-app/perf/memory-leaks/main-page.ts @@ -2,6 +2,7 @@ import { EventData } from "tns-core-modules/data/observable"; import { MainPageViewModel } from "../../mainPage"; import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout"; import { Page } from "tns-core-modules/ui/page"; +import { isAndroid } from "tns-core-modules/platform"; export function pageLoaded(args: EventData) { let page = args.object; @@ -10,8 +11,9 @@ export function pageLoaded(args: EventData) { let wrapLayout = view.getViewById(page, "wrapLayoutWithExamples"); let examples: Map = new Map(); - examples.set("background-image", "perf/memory-leaks/background-image"); - + if (isAndroid) { + examples.set("background-image", "perf/memory-leaks/background-image"); + } let viewModel = new SubMainPageViewModel(wrapLayout, examples); page.bindingContext = viewModel; } diff --git a/apps/app/ui-tests-app/perf/properties/tests.ts b/apps/app/ui-tests-app/perf/properties/tests.ts index 1c7b77d13..2e8599423 100644 --- a/apps/app/ui-tests-app/perf/properties/tests.ts +++ b/apps/app/ui-tests-app/perf/properties/tests.ts @@ -3,13 +3,14 @@ import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout"; import { Label } from "tns-core-modules/ui/label"; const average = 3; - +const noValue = "noValue"; const colors = ['red', 'green']; export function addRemove(counts: Array, parent: LayoutBase): string { let result = `addRemove`; counts.forEach((count) => { if (count > 10000) { + result += setResultTime(noValue); return; } @@ -46,6 +47,7 @@ export function setBackgroundColor(counts: Array, parent?: LayoutBase): let result = `setBackgroundColor ${parent ? 'with nativeView' : ''}`; counts.forEach((count) => { if (parent && count > 10000) { + result += setResultTime(noValue); return; } @@ -67,7 +69,8 @@ export function setBorderWidths(counts: Array, parent?: LayoutBase): str let result = `setBorderWidths ${parent ? 'with nativeView' : ''}`; counts.forEach((count) => { if (count > 10000 && parent) { - return; + result += setResultTime(noValue); + return; } const lbl = setup(parent); @@ -107,6 +110,7 @@ export function setColorWithParents(counts: Array, parent: LayoutBase): const style = parent.style; counts.forEach((count) => { if (count > 10000) { + result += setResultTime(noValue); return; } @@ -144,6 +148,7 @@ export function setFontSizeWithParents(counts: Array, parent: LayoutBase const style = parent.style; counts.forEach((count) => { if (count > 1000) { + result += setResultTime(noValue); return; } @@ -180,6 +185,7 @@ export function setFontWeightWithParents(counts: Array, parent: LayoutBa const style = parent.style; counts.forEach((count) => { if (count > 1000) { + result += setResultTime(noValue); return; } @@ -214,6 +220,7 @@ export function setBindingContextWithParents(counts: Array, parent: Layo let result = `setBindingContextWithParents`; counts.forEach((count) => { if (count > 10000) { + result += setResultTime(noValue); return; } setupParents(parent); @@ -232,6 +239,7 @@ export function setBindingContextWithParentsBound(counts: Array, parent: let result = `setBindingContextWithParentsBound`; counts.forEach((count) => { if (count > 1000) { + result += setResultTime(noValue); return; } @@ -301,5 +309,5 @@ function executeTest(func: Function): string { } function setResultTime(time: string) { - return ' ' + `\t${time}` + ' '; + return `\t${time}`; } \ No newline at end of file