From 01edf37d33139fef35a939951424c34f94ea67d8 Mon Sep 17 00:00:00 2001 From: Panayot Cankov Date: Tue, 17 Jan 2017 16:56:56 +0200 Subject: [PATCH] value-source-tests will now use unsetValue instead of undefined when resetting local value --- tests/app/testRunner.ts | 2 +- tests/app/ui/styling/value-source-tests.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/app/testRunner.ts b/tests/app/testRunner.ts index 2b2f2eedd..015ad3313 100644 --- a/tests/app/testRunner.ts +++ b/tests/app/testRunner.ts @@ -68,7 +68,7 @@ allTests["FRAME"] = require("./ui/frame/frame-tests"); allTests["VIEW"] = require("./ui/view/view-tests"); allTests["STYLE"] = require("./ui/styling/style-tests"); allTests["VISUAL-STATE"] = require("./ui/styling/visual-state-tests"); -// allTests["VALUE-SOURCE"] = require("./ui/styling/value-source-tests"); +allTests["VALUE-SOURCE"] = require("./ui/styling/value-source-tests"); allTests["CSS-SELECTOR-PARSER"] = require("./ui/styling/css-selector-parser"); allTests["CSS-SELECTOR"] = require("./ui/styling/css-selector"); allTests["BUTTON"] = require("./ui/button/button-tests"); diff --git a/tests/app/ui/styling/value-source-tests.ts b/tests/app/ui/styling/value-source-tests.ts index ea1e6f69f..b61548d15 100644 --- a/tests/app/ui/styling/value-source-tests.ts +++ b/tests/app/ui/styling/value-source-tests.ts @@ -3,6 +3,7 @@ import * as button from "ui/button"; import * as stack from "ui/layouts/stack-layout"; import * as helper from "../helper"; import * as TKUnit from "../../TKUnit"; +import { unsetValue } from "ui/core/view"; export var test_value_Inherited_stronger_than_Default = function () { let page = helper.getCurrentPage(); @@ -39,6 +40,6 @@ export function test_value_Local_stronger_than_Css() { helper.assertViewColor(btn, "#FF0000"); btn.style.color = new color.Color("#0000FF"); helper.assertViewColor(btn, "#0000FF"); - btn.style.color = undefined; + btn.style.color = unsetValue; TKUnit.assertEqual(btn.style.color, undefined, "style.color should be undefined when set locally."); }