From 3cbc3db20160a1130b8add58ed8952a15269bd60 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 19 Jul 2015 11:22:49 -0700
Subject: [PATCH] Fixing fourslash tests

---
 tests/cases/fourslash/completionEntryForUnionProperty.ts  | 2 +-
 tests/cases/fourslash/completionEntryForUnionProperty2.ts | 4 ++--
 tests/cases/fourslash/genericTypeArgumentInference1.ts    | 4 ++--
 tests/cases/fourslash/genericTypeArgumentInference2.ts    | 4 ++--
 tests/cases/fourslash/quickinfoForUnionProperty.ts        | 2 +-
 tests/cases/fourslash/server/quickinfo01.ts               | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/cases/fourslash/completionEntryForUnionProperty.ts b/tests/cases/fourslash/completionEntryForUnionProperty.ts
index bc0f9405a1b..e34923eb69c 100644
--- a/tests/cases/fourslash/completionEntryForUnionProperty.ts
+++ b/tests/cases/fourslash/completionEntryForUnionProperty.ts
@@ -15,6 +15,6 @@
 ////x./**/
 
 goTo.marker();
-verify.memberListContains("commonProperty", "(property) commonProperty: string | number");
+verify.memberListContains("commonProperty", "(property) commonProperty: number | string");
 verify.memberListContains("commonFunction", "(method) commonFunction(): number");
 verify.memberListCount(2);
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionEntryForUnionProperty2.ts b/tests/cases/fourslash/completionEntryForUnionProperty2.ts
index 7cd190f0a32..0b2d50fc130 100644
--- a/tests/cases/fourslash/completionEntryForUnionProperty2.ts
+++ b/tests/cases/fourslash/completionEntryForUnionProperty2.ts
@@ -15,6 +15,6 @@
 ////x.commonProperty./**/
 
 goTo.marker();
-verify.memberListContains("toString", "(property) toString: (() => string) | ((radix?: number) => string)");
-verify.memberListContains("valueOf", "(method) valueOf(): string | number");
+verify.memberListContains("toString", "(property) toString: ((radix?: number) => string) | (() => string)");
+verify.memberListContains("valueOf", "(method) valueOf(): number | string");
 verify.memberListCount(2);
\ No newline at end of file
diff --git a/tests/cases/fourslash/genericTypeArgumentInference1.ts b/tests/cases/fourslash/genericTypeArgumentInference1.ts
index d8c332449e1..c8d23ba2565 100644
--- a/tests/cases/fourslash/genericTypeArgumentInference1.ts
+++ b/tests/cases/fourslash/genericTypeArgumentInference1.ts
@@ -18,9 +18,9 @@
 ////var /*4*/r4 = _./*41*/all([<any>true], _.identity);
 
 goTo.marker('1');
-verify.quickInfoIs('var r: string | number | boolean');
+verify.quickInfoIs('var r: boolean | number | string');
 goTo.marker('11');
-verify.quickInfoIs('(method) Underscore.Static.all<string | number | boolean>(list: (string | number | boolean)[], iterator?: Underscore.Iterator<string | number | boolean, boolean>, context?: any): string | number | boolean');
+verify.quickInfoIs('(method) Underscore.Static.all<boolean | number | string>(list: (boolean | number | string)[], iterator?: Underscore.Iterator<boolean | number | string, boolean>, context?: any): boolean | number | string');
 
 goTo.marker('2');
 verify.quickInfoIs('var r2: boolean');
diff --git a/tests/cases/fourslash/genericTypeArgumentInference2.ts b/tests/cases/fourslash/genericTypeArgumentInference2.ts
index aaf0d138f2f..2303e3298a3 100644
--- a/tests/cases/fourslash/genericTypeArgumentInference2.ts
+++ b/tests/cases/fourslash/genericTypeArgumentInference2.ts
@@ -18,9 +18,9 @@
 ////var /*4*/r4 = _./*41*/all([<any>true], _.identity);
 
 goTo.marker('1');
-verify.quickInfoIs('var r: string | number | boolean');
+verify.quickInfoIs('var r: boolean | number | string');
 goTo.marker('11');
-verify.quickInfoIs('(method) Underscore.Static.all<string | number | boolean>(list: (string | number | boolean)[], iterator?: Underscore.Iterator<string | number | boolean, boolean>, context?: any): string | number | boolean');
+verify.quickInfoIs('(method) Underscore.Static.all<boolean | number | string>(list: (boolean | number | string)[], iterator?: Underscore.Iterator<boolean | number | string, boolean>, context?: any): boolean | number | string');
 
 goTo.marker('2');
 verify.quickInfoIs('var r2: boolean');
diff --git a/tests/cases/fourslash/quickinfoForUnionProperty.ts b/tests/cases/fourslash/quickinfoForUnionProperty.ts
index 5292eb6c2c8..4cb87b3b3f8 100644
--- a/tests/cases/fourslash/quickinfoForUnionProperty.ts
+++ b/tests/cases/fourslash/quickinfoForUnionProperty.ts
@@ -21,7 +21,7 @@ verify.quickInfoIs('var x: One | Two');
 
 
 goTo.marker("2");
-verify.quickInfoIs('(property) commonProperty: string | number');
+verify.quickInfoIs('(property) commonProperty: number | string');
 
 goTo.marker("3");
 verify.quickInfoIs('(method) commonFunction(): number');
diff --git a/tests/cases/fourslash/server/quickinfo01.ts b/tests/cases/fourslash/server/quickinfo01.ts
index 9008505e447..e04175f76bc 100644
--- a/tests/cases/fourslash/server/quickinfo01.ts
+++ b/tests/cases/fourslash/server/quickinfo01.ts
@@ -21,7 +21,7 @@ verify.quickInfoIs('var x: One | Two');
 
 
 goTo.marker("2");
-verify.quickInfoIs('(property) commonProperty: string | number');
+verify.quickInfoIs('(property) commonProperty: number | string');
 
 goTo.marker("3");
 verify.quickInfoIs('(method) commonFunction(): number');