Skip to content

Commit 908a6ae

Browse files
committed
fix tests
1 parent a18fe4d commit 908a6ae

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

src/compiler/checker.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,9 @@ namespace ts {
266266
getUnknownType: () => unknownType,
267267
getLiteralType: (literal: string | number) => {
268268
/* tslint:disable:no-null-keyword */
269-
Debug.assert(literal !== undefined && literal !== null);
269+
Debug.assert(literal !== undefined && literal !== null, "Argument to getLiteralType was null or undefined");
270270
/* tslint:enable:no-null-keyword */
271-
Debug.assert(typeof literal === "string" || typeof literal === "number");
271+
Debug.assert(typeof literal === "string" || typeof literal === "number", "Argument to getLiteralType was not a string or number");
272272
return getLiteralType(literal);
273273
},
274274
getFalseType: () => falseType,

src/harness/unittests/checkerPublicRelationships.ts

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,39 +87,35 @@ namespace ts {
8787
});
8888

8989
it("can get string literal types", () => {
90-
assert((checker.getLiteralType("foobar") as LiteralType).value === "foobar");
90+
assert(checker.getLiteralType("foobar").value === "foobar");
9191
});
9292

9393
it("can get numeber literal types", () => {
94-
assert((checker.getLiteralType(42) as LiteralType).value === "42");
94+
assert(checker.getLiteralType(42).value === 42);
9595
});
9696

9797
it("doesn't choke on exceptional input to literal type getters", () => {
98-
assert.equal((checker.getLiteralType("") as LiteralType).value, "");
99-
assert.throws(() => checker.getLiteralType(/*content*/ undefined), Error, "Debug Failure. False expression:");
98+
assert.equal(checker.getLiteralType("").value, "");
99+
assert.throws(() => checker.getLiteralType(/*content*/ undefined), Error, "Argument to getLiteralType was null or undefined");
100100
/* tslint:disable:no-null-keyword */
101-
assert.throws(() => checker.getLiteralType(/*content*/ null), Error, "Debug Failure. False expression:");
101+
assert.throws(() => checker.getLiteralType(/*content*/ null), Error, "Argument to getLiteralType was null or undefined");
102102
/* tslint:enable:no-null-keyword */
103103
let hugeStringLiteral = map(new Array(2 ** 16 - 1), () => "a").join();
104-
assert.equal((checker.getLiteralType(hugeStringLiteral) as LiteralType).value, hugeStringLiteral);
104+
assert.equal(checker.getLiteralType(hugeStringLiteral).value, hugeStringLiteral);
105105
hugeStringLiteral = undefined;
106106

107-
108-
assert.throws(() => checker.getLiteralType(/*content*/ undefined), Error, "Debug Failure. False expression:");
109-
/* tslint:disable:no-null-keyword */
110-
assert.throws(() => checker.getLiteralType(/*content*/ null), Error, "Debug Failure. False expression:");
111-
/* tslint:enable:no-null-keyword */
112-
113107
const sanityChecks = ["000", "0b0", "0x0", "0.0", "0e-0", "-010", "-0b10", "-0x10", "-0o10", "-10.0", "-1e-1", "NaN", "Infinity", "-Infinity"];
114108
forEach(sanityChecks, num => {
115-
assert.equal((checker.getLiteralType(num) as LiteralType).value, num, `${num} did not match.`);
109+
assert.equal(checker.getLiteralType(num).value, num, `${num} did not match.`);
116110
});
117111

118-
const insanityChecks = [[0, "0"], [0b0, "0"], [-10, "-10"], [NaN, "NaN"], [Infinity, "Infinity"], [-Infinity, "-Infinity"]];
119-
forEach(insanityChecks, ([num, expected]) => {
120-
assert.equal((checker.getLiteralType(num as any) as LiteralType).value, expected, `${JSON.stringify(num)} should be ${expected}`);
112+
const insanityChecks = [0, 0b0, -10, Infinity, -Infinity];
113+
forEach(insanityChecks, (num) => {
114+
assert.equal(checker.getLiteralType(num).value, num, `${JSON.stringify(num)} should be ${num}`);
121115
});
122116

117+
assert.isNaN(checker.getLiteralType(NaN).value);
118+
123119
const instabilityChecks = [{ foo: 42 }, new Date(42), [42], new Number(42), new String("42")];
124120
forEach(instabilityChecks, (bad) => {
125121
assert.throws(() => checker.getLiteralType(bad as any));

0 commit comments

Comments
 (0)