From 268b2d44fa508b9e8ccfc1b2b71d1b25967cf52e Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Sun, 28 Feb 2016 20:22:46 -0800
Subject: [PATCH] Accepted baselines.

---
 tests/baselines/reference/fuzzy.errors.txt    |  2 --
 ...ertyAndDerivedContainerOfBase01.errors.txt | 24 -----------------
 ...ropertyAndDerivedContainerOfBase01.symbols | 27 +++++++++++++++++++
 ...ePropertyAndDerivedContainerOfBase01.types | 27 +++++++++++++++++++
 4 files changed, 54 insertions(+), 26 deletions(-)
 delete mode 100644 tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.errors.txt
 create mode 100644 tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.symbols
 create mode 100644 tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.types

diff --git a/tests/baselines/reference/fuzzy.errors.txt b/tests/baselines/reference/fuzzy.errors.txt
index 0aa8207ff98..72ac4c816f9 100644
--- a/tests/baselines/reference/fuzzy.errors.txt
+++ b/tests/baselines/reference/fuzzy.errors.txt
@@ -4,7 +4,6 @@ tests/cases/compiler/fuzzy.ts(21,20): error TS2322: Type '{ anything: number; on
   Types of property 'oneI' are incompatible.
     Type 'this' is not assignable to type 'I'.
       Type 'C' is not assignable to type 'I'.
-        Property 'alsoWorks' is missing in type 'C'.
 tests/cases/compiler/fuzzy.ts(25,20): error TS2352: Neither type '{ oneI: this; }' nor type 'R' is assignable to the other.
   Property 'anything' is missing in type '{ oneI: this; }'.
 
@@ -39,7 +38,6 @@ tests/cases/compiler/fuzzy.ts(25,20): error TS2352: Neither type '{ oneI: this;
 !!! error TS2322:   Types of property 'oneI' are incompatible.
 !!! error TS2322:     Type 'this' is not assignable to type 'I'.
 !!! error TS2322:       Type 'C' is not assignable to type 'I'.
-!!! error TS2322:         Property 'alsoWorks' is missing in type 'C'.
             }
     
             worksToo():R {
diff --git a/tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.errors.txt b/tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.errors.txt
deleted file mode 100644
index cde44b8a13a..00000000000
--- a/tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.errors.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-tests/cases/conformance/types/thisType/thisTypeInBasePropertyAndDerivedContainerOfBase01.ts(11,21): error TS2344: Type 'this' does not satisfy the constraint 'Foo'.
-  Type 'Bar' is not assignable to type 'Foo'.
-    Types of property 'self' are incompatible.
-      Type 'Bar' is not assignable to type 'this'.
-
-
-==== tests/cases/conformance/types/thisType/thisTypeInBasePropertyAndDerivedContainerOfBase01.ts (1 errors) ====
-    
-    interface BoxOfFoo<T extends Foo> {
-        item: T
-    }
-    
-    interface Foo {
-        self: this;
-    }
-    
-    interface Bar extends Foo {
-        other: BoxOfFoo<this>;
-                        ~~~~
-!!! error TS2344: Type 'this' does not satisfy the constraint 'Foo'.
-!!! error TS2344:   Type 'Bar' is not assignable to type 'Foo'.
-!!! error TS2344:     Types of property 'self' are incompatible.
-!!! error TS2344:       Type 'Bar' is not assignable to type 'this'.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.symbols b/tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.symbols
new file mode 100644
index 00000000000..379e4d3c8a4
--- /dev/null
+++ b/tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.symbols
@@ -0,0 +1,27 @@
+=== tests/cases/conformance/types/thisType/thisTypeInBasePropertyAndDerivedContainerOfBase01.ts ===
+
+interface BoxOfFoo<T extends Foo> {
+>BoxOfFoo : Symbol(BoxOfFoo, Decl(thisTypeInBasePropertyAndDerivedContainerOfBase01.ts, 0, 0))
+>T : Symbol(T, Decl(thisTypeInBasePropertyAndDerivedContainerOfBase01.ts, 1, 19))
+>Foo : Symbol(Foo, Decl(thisTypeInBasePropertyAndDerivedContainerOfBase01.ts, 3, 1))
+
+    item: T
+>item : Symbol(item, Decl(thisTypeInBasePropertyAndDerivedContainerOfBase01.ts, 1, 35))
+>T : Symbol(T, Decl(thisTypeInBasePropertyAndDerivedContainerOfBase01.ts, 1, 19))
+}
+
+interface Foo {
+>Foo : Symbol(Foo, Decl(thisTypeInBasePropertyAndDerivedContainerOfBase01.ts, 3, 1))
+
+    self: this;
+>self : Symbol(self, Decl(thisTypeInBasePropertyAndDerivedContainerOfBase01.ts, 5, 15))
+}
+
+interface Bar extends Foo {
+>Bar : Symbol(Bar, Decl(thisTypeInBasePropertyAndDerivedContainerOfBase01.ts, 7, 1))
+>Foo : Symbol(Foo, Decl(thisTypeInBasePropertyAndDerivedContainerOfBase01.ts, 3, 1))
+
+    other: BoxOfFoo<this>;
+>other : Symbol(other, Decl(thisTypeInBasePropertyAndDerivedContainerOfBase01.ts, 9, 27))
+>BoxOfFoo : Symbol(BoxOfFoo, Decl(thisTypeInBasePropertyAndDerivedContainerOfBase01.ts, 0, 0))
+}
diff --git a/tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.types b/tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.types
new file mode 100644
index 00000000000..9f6b83df057
--- /dev/null
+++ b/tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.types
@@ -0,0 +1,27 @@
+=== tests/cases/conformance/types/thisType/thisTypeInBasePropertyAndDerivedContainerOfBase01.ts ===
+
+interface BoxOfFoo<T extends Foo> {
+>BoxOfFoo : BoxOfFoo<T>
+>T : T
+>Foo : Foo
+
+    item: T
+>item : T
+>T : T
+}
+
+interface Foo {
+>Foo : Foo
+
+    self: this;
+>self : this
+}
+
+interface Bar extends Foo {
+>Bar : Bar
+>Foo : Foo
+
+    other: BoxOfFoo<this>;
+>other : BoxOfFoo<this>
+>BoxOfFoo : BoxOfFoo<T>
+}