From 00e7c46ea90e53174efe5e05e144ac998949cdb4 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Fri, 28 Aug 2015 15:59:37 -0700 Subject: [PATCH] Fixing fourslash tests --- .../cases/fourslash/bestCommonTypeObjectLiterals1.ts | 2 +- .../fourslash/completionEntryForUnionProperty2.ts | 6 +++--- .../fourslash/contextualTypingOfArrayLiterals1.ts | 12 ++---------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/tests/cases/fourslash/bestCommonTypeObjectLiterals1.ts b/tests/cases/fourslash/bestCommonTypeObjectLiterals1.ts index d7ccbe73f33..5a8f661789c 100644 --- a/tests/cases/fourslash/bestCommonTypeObjectLiterals1.ts +++ b/tests/cases/fourslash/bestCommonTypeObjectLiterals1.ts @@ -24,7 +24,7 @@ goTo.marker('1'); verify.quickInfoIs('var c: {\n name: string;\n age: number;\n}[]'); goTo.marker('2'); -verify.quickInfoIs('var c1: ({\n name: string;\n age: number;\n} | {\n name: string;\n age: number;\n dob: Date;\n})[]'); +verify.quickInfoIs('var c1: {\n name: string;\n age: number;\n}[]'); goTo.marker('3'); verify.quickInfoIs('var c2: ({\n\ diff --git a/tests/cases/fourslash/completionEntryForUnionProperty2.ts b/tests/cases/fourslash/completionEntryForUnionProperty2.ts index aa5bc40b5e3..c2d7bc406a5 100644 --- a/tests/cases/fourslash/completionEntryForUnionProperty2.ts +++ b/tests/cases/fourslash/completionEntryForUnionProperty2.ts @@ -1,12 +1,12 @@ /// ////interface One { -//// commonProperty: number; +//// commonProperty: string; //// commonFunction(): number; ////} //// ////interface Two { -//// commonProperty: string +//// commonProperty: number; //// commonFunction(): number; ////} //// @@ -16,5 +16,5 @@ goTo.marker(); verify.memberListContains("toString", "(method) toString(): string"); -verify.memberListContains("valueOf", "(method) valueOf(): number | string"); +verify.memberListContains("valueOf", "(method) valueOf(): string | number"); verify.memberListCount(2); \ No newline at end of file diff --git a/tests/cases/fourslash/contextualTypingOfArrayLiterals1.ts b/tests/cases/fourslash/contextualTypingOfArrayLiterals1.ts index fb77ecdce65..dbd7aeb5f01 100644 --- a/tests/cases/fourslash/contextualTypingOfArrayLiterals1.ts +++ b/tests/cases/fourslash/contextualTypingOfArrayLiterals1.ts @@ -43,21 +43,13 @@ goTo.marker('4'); verify.quickInfoIs('var r4: C'); goTo.marker('5'); -verify.quickInfoIs('var x5: ({\n\ +verify.quickInfoIs('var x5: {\n\ name: string;\n\ age: number;\n\ -} | {\n\ - name: string;\n\ - age: number;\n\ - dob: Date;\n\ -})[]'); +}[]'); goTo.marker('6'); verify.quickInfoIs('var r5: {\n\ name: string;\n\ age: number;\n\ -} | {\n\ - name: string;\n\ - age: number;\n\ - dob: Date;\n\ }');