Skip to content

Commit 291d36d

Browse files
author
vakrilov
committed
expressions + formatted string tests
1 parent 8a4e6c4 commit 291d36d

File tree

3 files changed

+42
-42
lines changed

3 files changed

+42
-42
lines changed

‎tests/app/testRunner.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ allTests["COLOR"] = require("./color-tests");
4545

4646
allTests["DEPENDENCY-OBSERVABLE"] = require("./ui/dependency-observable-tests");
4747
// allTests["BINDABLE"] = require("./ui/bindable-tests");
48-
// allTests["BINDING-EXPRESSIONS"] = require("./ui/binding-expressions-tests");
48+
allTests["BINDING-EXPRESSIONS"] = require("./ui/binding-expressions-tests");
4949
allTests["XML-PARSER"] = require("./xml-parser-tests/xml-parser-tests");
50-
// allTests["FORMATTEDSTRING"] = require("./text/formatted-string-tests");
50+
allTests["FORMATTEDSTRING"] = require("./text/formatted-string-tests");
5151
allTests["FILE-SYSTEM-ACCESS"] = require("./file-system-access-tests/file-system-access-tests");
5252
allTests["FILE-NAME-RESOLVER"] = require("./file-name-resolver-tests/file-name-resolver-tests");
5353
allTests["WEAK-EVENTS"] = require("./weak-event-listener-tests");

‎tests/app/text/formatted-string-tests.ts‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
// >> formatted-string-require
2-
import * as formattedStringModule from "text/formatted-string";
3-
import * as spanModule from "text/span";
2+
import { FormattedString } from "text/formatted-string";
3+
import { Span } from "text/span";
44
// << formatted-string-require
55

6-
import * as observable from "data/observable";
6+
import { Observable } from "data/observable";
7+
import { Label } from "ui/label";
78
import * as TKUnit from "../TKUnit";
8-
import * as LabelModule from "ui/label";
99

10-
export var test_FormattedString_RemovesEventListeners_for_spans = function () {
10+
export function test_FormattedString_RemovesEventListeners_for_spans() {
1111
// >> formatted-string-set
12-
var label = new LabelModule.Label();
13-
var formattedString = new formattedStringModule.FormattedString();
14-
var firstSpan = new spanModule.Span();
12+
const label = new Label();
13+
const formattedString = new FormattedString();
14+
const firstSpan = new Span();
1515

1616
firstSpan.fontSize = 15;
1717
firstSpan.text = "LoremIpsum";
1818
formattedString.spans.push(firstSpan);
1919
label.formattedText = formattedString;
2020
// << formatted-string-set
2121

22-
TKUnit.assert(formattedString.spans.getItem(0).hasListeners(observable.Observable.propertyChangeEvent) === true, "Listener for spans collection change event is not attached!");
23-
var removedSpan = formattedString.spans.pop();
24-
TKUnit.assert(removedSpan.hasListeners(observable.Observable.propertyChangeEvent) === false, "Listener for spans collection change event is not removed!");
25-
}
22+
TKUnit.assert(formattedString.spans.getItem(0).hasListeners(Observable.propertyChangeEvent) === true, "Listener for spans collection change event is not attached!");
23+
const removedSpan = formattedString.spans.pop();
24+
TKUnit.assert(removedSpan.hasListeners(Observable.propertyChangeEvent) === false, "Listener for spans collection change event is not removed!");
25+
};
2626

27-
export var test_FormattedTextProperty_IsChanged_When_SpanIsAdded = function () {
28-
var formattedString = new formattedStringModule.FormattedString();
29-
var formattedTextChanged = false;
30-
formattedString.addEventListener(observable.Observable.propertyChangeEvent, () => {
27+
export function test_FormattedTextProperty_IsChanged_When_SpanIsAdded() {
28+
const formattedString = new FormattedString();
29+
let formattedTextChanged = false;
30+
formattedString.addEventListener(Observable.propertyChangeEvent, () => {
3131
formattedTextChanged = true;
3232
});
3333

34-
var firstSpan = new spanModule.Span();
34+
const firstSpan = new Span();
3535
firstSpan.fontSize = 15;
3636
firstSpan.text = "LoremIpsum";
3737
formattedString.spans.push(firstSpan);
3838

3939
TKUnit.assertTrue(formattedTextChanged, "FormattedText property is not changed.");
40-
}
40+
};
4141

42-
export var test_FormattedTextProperty_IsChanged_When_SpanIsChanged = function () {
43-
var formattedString = new formattedStringModule.FormattedString();
44-
var expectedValue = 17;
42+
export function test_FormattedTextProperty_IsChanged_When_SpanIsChanged() {
43+
const formattedString = new FormattedString();
44+
const expectedValue = 17;
4545

46-
var firstSpan = new spanModule.Span();
46+
const firstSpan = new Span();
4747
firstSpan.fontSize = 15;
4848
firstSpan.text = "LoremIpsum";
4949
formattedString.spans.push(firstSpan);
5050

51-
var formattedTextChanged = false;
52-
formattedString.addEventListener(observable.Observable.propertyChangeEvent, () => {
51+
let formattedTextChanged = false;
52+
formattedString.addEventListener(Observable.propertyChangeEvent, () => {
5353
formattedTextChanged = true;
5454
});
5555

@@ -59,23 +59,23 @@ export var test_FormattedTextProperty_IsChanged_When_SpanIsChanged = function ()
5959

6060
TKUnit.assertTrue(formattedTextChanged, "FormattedText property is not changed.");
6161
TKUnit.assert(formattedString.spans.getItem(0).fontSize === expectedValue, "FormattedString internal span is not changed as expected");
62-
}
62+
};
6363

64-
export var test_FormattedTextProperty_DoNotCrash_When_KnownColorIsSetForForegroundColor = function () {
65-
var formattedString = new formattedStringModule.FormattedString();
66-
var expectedValue1 = "red";
67-
var expectedValue2 = "blue";
64+
export function test_FormattedTextProperty_DoNotCrash_When_KnownColorIsSetForForegroundColor() {
65+
const formattedString = new FormattedString();
66+
const expectedValue1 = "red";
67+
const expectedValue2 = "blue";
6868

69-
var firstSpan = new spanModule.Span();
69+
const firstSpan = new Span();
7070
firstSpan.foregroundColor = <any>expectedValue1;
7171
firstSpan.text = "LoremIpsum1";
7272
formattedString.spans.push(firstSpan);
7373

74-
var secondSpan = new spanModule.Span();
74+
const secondSpan = new Span();
7575
secondSpan.backgroundColor = <any>expectedValue2;
7676
secondSpan.text = "LoremIpsum2";
7777
formattedString.spans.push(secondSpan);
7878

7979
TKUnit.assertEqual(formattedString.spans.getItem(0).foregroundColor.name, expectedValue1);
8080
TKUnit.assertEqual(formattedString.spans.getItem(1).backgroundColor.name, expectedValue2);
81-
}
81+
};

‎tns-core-modules/ui/label/label.ios.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,25 @@ enum FixedSize {
2020
const zeroLength: Length = {
2121
value: 0,
2222
unit: "px"
23-
}
23+
};
2424

2525
export class Label extends TextBase implements LabelDefinition {
26-
private _ios: TNSLabel;
26+
public nativeView: TNSLabel;
2727
private _fixedSize: FixedSize;
2828

2929
constructor() {
3030
super();
3131

32-
this._ios = TNSLabel.new();
33-
this._ios.userInteractionEnabled = true;
32+
this.nativeView = TNSLabel.new();
33+
this.nativeView.userInteractionEnabled = true;
3434
}
3535

3636
get ios(): TNSLabel {
37-
return this._ios;
37+
return this.nativeView;
3838
}
3939

4040
get _nativeView(): TNSLabel {
41-
return this._ios;
41+
return this.nativeView;
4242
}
4343

4444
get textWrap(): boolean {
@@ -106,7 +106,7 @@ export class Label extends TextBase implements LabelDefinition {
106106
}
107107
set [whiteSpaceProperty.native](value: WhiteSpace) {
108108
let nativeView = this.nativeView;
109-
switch(value){
109+
switch (value) {
110110
case WhiteSpace.NORMAL:
111111
nativeView.lineBreakMode = NSLineBreakMode.ByWordWrapping;
112112
nativeView.numberOfLines = 0;
@@ -115,7 +115,7 @@ export class Label extends TextBase implements LabelDefinition {
115115
nativeView.lineBreakMode = NSLineBreakMode.ByTruncatingTail;
116116
nativeView.numberOfLines = 1;
117117
break;
118-
default:
118+
default:
119119
throw new Error(`Invalid whitespace value: ${value}. Valid values are: "${WhiteSpace.NORMAL}", "${WhiteSpace.NO_WRAP}".`);
120120
}
121121
}

0 commit comments

Comments
 (0)