From 23f56dadfb422e3c45d8ee15f4d587eed1959bf4 Mon Sep 17 00:00:00 2001 From: Dick van den Brink Date: Sun, 8 Mar 2015 18:59:04 +0100 Subject: [PATCH] Fixed tests due to lib.d.ts changes --- .../types/primitives/number/assignFromNumberInterface2.ts | 1 + .../types/primitives/string/assignFromStringInterface2.ts | 1 + .../stringLiteralTypeIsSubtypeOfString.ts | 1 + tests/cases/fourslash/completionEntryForUnionProperty2.ts | 3 ++- tests/cases/fourslash/completionListEnumMembers.ts | 2 +- tests/cases/fourslash/memberCompletionInForEach1.ts | 5 ++--- tests/cases/fourslash/server/completions.ts | 5 ++--- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts b/tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts index b516f7b864d..da7da7c7a06 100644 --- a/tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts +++ b/tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts @@ -7,6 +7,7 @@ interface NotNumber { toFixed(fractionDigits?: number): string; toExponential(fractionDigits?: number): string; toPrecision(precision?: number): string; + valueOf(): number; doStuff(): string; } diff --git a/tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts b/tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts index 981df14faa3..16308f90251 100644 --- a/tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts +++ b/tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts @@ -30,6 +30,7 @@ interface NotString { trim(): string; length: number; substr(from: number, length?: number): string; + valueOf(): string; [index: number]: string; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts index 15764837bc0..c7e9c0fc8e9 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts @@ -60,6 +60,7 @@ class C implements String { trim(): string { return null; } length: number; substr(from: number, length?: number): string { return null; } + valueOf(): string { return null; } [index: number]: string; } diff --git a/tests/cases/fourslash/completionEntryForUnionProperty2.ts b/tests/cases/fourslash/completionEntryForUnionProperty2.ts index b32e6d05345..ccf0b402d08 100644 --- a/tests/cases/fourslash/completionEntryForUnionProperty2.ts +++ b/tests/cases/fourslash/completionEntryForUnionProperty2.ts @@ -16,4 +16,5 @@ goTo.marker(); verify.memberListContains("toString", "(method) toString(): string"); -verify.memberListCount(1); \ No newline at end of file +verify.memberListContains("valueOf", "(method) valueOf(): string | number"); +verify.memberListCount(2); \ No newline at end of file diff --git a/tests/cases/fourslash/completionListEnumMembers.ts b/tests/cases/fourslash/completionListEnumMembers.ts index 938b4aa2f2e..9c24f6228b0 100644 --- a/tests/cases/fourslash/completionListEnumMembers.ts +++ b/tests/cases/fourslash/completionListEnumMembers.ts @@ -21,4 +21,4 @@ verify.memberListCount(0); goTo.marker('enumValueReference'); verify.memberListContains("toString"); verify.memberListContains("toFixed"); -verify.memberListCount(4); +verify.memberListCount(5); diff --git a/tests/cases/fourslash/memberCompletionInForEach1.ts b/tests/cases/fourslash/memberCompletionInForEach1.ts index 82d3b5b2400..2af0393283f 100644 --- a/tests/cases/fourslash/memberCompletionInForEach1.ts +++ b/tests/cases/fourslash/memberCompletionInForEach1.ts @@ -7,11 +7,10 @@ goTo.marker('1'); edit.insert('.'); verify.memberListContains('trim'); -verify.memberListCount(20); +verify.memberListCount(21); edit.insert('});'); // need the following lines to not have parse errors in order for completion list to appear goTo.marker('2'); edit.insert('.'); verify.memberListContains('trim'); -verify.memberListCount(20); - \ No newline at end of file +verify.memberListCount(21); diff --git a/tests/cases/fourslash/server/completions.ts b/tests/cases/fourslash/server/completions.ts index 82d3b5b2400..2af0393283f 100644 --- a/tests/cases/fourslash/server/completions.ts +++ b/tests/cases/fourslash/server/completions.ts @@ -7,11 +7,10 @@ goTo.marker('1'); edit.insert('.'); verify.memberListContains('trim'); -verify.memberListCount(20); +verify.memberListCount(21); edit.insert('});'); // need the following lines to not have parse errors in order for completion list to appear goTo.marker('2'); edit.insert('.'); verify.memberListContains('trim'); -verify.memberListCount(20); - \ No newline at end of file +verify.memberListCount(21);