javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 21:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #253 from NativeScript/nnikolov/TestFixes

Browse Source 
Fixed paths for label tests.
This commit is contained in:
Nedyalko Nikolov
2015-04-03 13:29:46 +03:00
parent 2384d196fd 5630fbcd01
commit 956e14eba3
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/tests/app/testRunnerPage.ts
View File

@ -4,7 +4,7 @@ import bm = require("ui/button");
import listViewDef = require("ui/list-view"); import listViewDef = require("ui/list-view");
import trace = require("trace"); import trace = require("trace");
trace.enable(); trace.enable();
trace.setCategories(trace.categories.Test); trace.setCategories(trace.categories.Test + "," + trace.categories.Error);
export function createPage() { export function createPage() {
var data: string[] = [""]; var data: string[] = [""];

5
apps/tests/ui/label/label-tests.ts
View File

@ -26,6 +26,7 @@ import textBase = require("ui/text-base");
import enums = require("ui/enums"); import enums = require("ui/enums");
import labelTestsNative = require("./label-tests-native"); import labelTestsNative = require("./label-tests-native");
import trace = require("trace"); import trace = require("trace");
import fs = require("file-system");
var errorMessage; var errorMessage;
var errorTraceWriter = { var errorTraceWriter = {
@ -477,7 +478,7 @@ export var testLocalTextAlignmentFromCssWhenAddingCssFileAllSelectorsAreApplied
view.id = "testLabel"; view.id = "testLabel";
var page = <page.Page>views[1]; var page = <page.Page>views[1];
page.addCss("#testLabel { text-align: " + expectedTextAlignment + "; }"); page.addCss("#testLabel { text-align: " + expectedTextAlignment + "; }");
page.addCssFile("/tests/ui/label/label-tests.css"); page.addCssFile(fs.path.join(__dirname, "label-tests.css"));
var actualResult = view.style.textAlignment; var actualResult = view.style.textAlignment;
// actual result is taken from #testLabel tag, because it has a greater priority (id vs type). // actual result is taken from #testLabel tag, because it has a greater priority (id vs type).
@ -513,7 +514,7 @@ export var testErrorMessageWhenWrongCssIsAddedWithFile = function () {
view.id = "testLabel"; view.id = "testLabel";
var page = <page.Page>views[1]; var page = <page.Page>views[1];
errorMessage = undefined; errorMessage = undefined;
page.addCssFile("/tests/ui/label/label-tests-wrong.css"); page.addCssFile(fs.path.join(__dirname, "label-tests-wrong.css"));
TKUnit.assertNotEqual(errorMessage, undefined); TKUnit.assertNotEqual(errorMessage, undefined);
}); });