From ae63df6cec0538f2f9fffbd36901bc254e030f86 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Fri, 20 May 2016 09:11:05 -0700 Subject: [PATCH] Rename test output to match test name --- ...=> genericInheritedDefaultConstructors.js} | 6 ++- ...enericInheritedDefaultConstructors.symbols | 42 +++++++++++++++++++ ...genericInheritedDefaultConstructors.types} | 7 +++- ...nericInheritedImplicitConstructors.symbols | 38 ----------------- 4 files changed, 52 insertions(+), 41 deletions(-) rename tests/baselines/reference/{genericInheritedImplicitConstructors.js => genericInheritedDefaultConstructors.js} (84%) create mode 100644 tests/baselines/reference/genericInheritedDefaultConstructors.symbols rename tests/baselines/reference/{genericInheritedImplicitConstructors.types => genericInheritedDefaultConstructors.types} (73%) delete mode 100644 tests/baselines/reference/genericInheritedImplicitConstructors.symbols diff --git a/tests/baselines/reference/genericInheritedImplicitConstructors.js b/tests/baselines/reference/genericInheritedDefaultConstructors.js similarity index 84% rename from tests/baselines/reference/genericInheritedImplicitConstructors.js rename to tests/baselines/reference/genericInheritedDefaultConstructors.js index 87c715c7aa..9c12ed6839 100644 --- a/tests/baselines/reference/genericInheritedImplicitConstructors.js +++ b/tests/baselines/reference/genericInheritedDefaultConstructors.js @@ -1,4 +1,4 @@ -//// [genericInheritedImplicitConstructors.ts] +//// [genericInheritedDefaultConstructors.ts] interface Constructor { new(...args: any[]): T; prototype: T; @@ -7,13 +7,14 @@ interface Constructor { class A { a: U; } class B extends A { b: V; } var c:Constructor> = B; // error here +var x = new B(); //class A1 { a: boolean; } //class B1 extends A1 { b: boolean; } //var c1:Constructor = B1; // no error here -//// [genericInheritedImplicitConstructors.js] +//// [genericInheritedDefaultConstructors.js] var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -32,6 +33,7 @@ var B = (function (_super) { return B; }(A)); var c = B; // error here +var x = new B(); //class A1 { a: boolean; } //class B1 extends A1 { b: boolean; } //var c1:Constructor = B1; // no error here diff --git a/tests/baselines/reference/genericInheritedDefaultConstructors.symbols b/tests/baselines/reference/genericInheritedDefaultConstructors.symbols new file mode 100644 index 0000000000..408abf1ef0 --- /dev/null +++ b/tests/baselines/reference/genericInheritedDefaultConstructors.symbols @@ -0,0 +1,42 @@ +=== tests/cases/compiler/genericInheritedDefaultConstructors.ts === +interface Constructor { +>Constructor : Symbol(Constructor, Decl(genericInheritedDefaultConstructors.ts, 0, 0)) +>T : Symbol(T, Decl(genericInheritedDefaultConstructors.ts, 0, 22)) + + new(...args: any[]): T; +>args : Symbol(args, Decl(genericInheritedDefaultConstructors.ts, 1, 8)) +>T : Symbol(T, Decl(genericInheritedDefaultConstructors.ts, 0, 22)) + + prototype: T; +>prototype : Symbol(Constructor.prototype, Decl(genericInheritedDefaultConstructors.ts, 1, 27)) +>T : Symbol(T, Decl(genericInheritedDefaultConstructors.ts, 0, 22)) +} + +class A { a: U; } +>A : Symbol(A, Decl(genericInheritedDefaultConstructors.ts, 3, 1)) +>U : Symbol(U, Decl(genericInheritedDefaultConstructors.ts, 5, 8)) +>a : Symbol(A.a, Decl(genericInheritedDefaultConstructors.ts, 5, 12)) +>U : Symbol(U, Decl(genericInheritedDefaultConstructors.ts, 5, 8)) + +class B extends A { b: V; } +>B : Symbol(B, Decl(genericInheritedDefaultConstructors.ts, 5, 20)) +>V : Symbol(V, Decl(genericInheritedDefaultConstructors.ts, 6, 8)) +>A : Symbol(A, Decl(genericInheritedDefaultConstructors.ts, 3, 1)) +>V : Symbol(V, Decl(genericInheritedDefaultConstructors.ts, 6, 8)) +>b : Symbol(B.b, Decl(genericInheritedDefaultConstructors.ts, 6, 25)) +>V : Symbol(V, Decl(genericInheritedDefaultConstructors.ts, 6, 8)) + +var c:Constructor> = B; // error here +>c : Symbol(c, Decl(genericInheritedDefaultConstructors.ts, 7, 3)) +>Constructor : Symbol(Constructor, Decl(genericInheritedDefaultConstructors.ts, 0, 0)) +>B : Symbol(B, Decl(genericInheritedDefaultConstructors.ts, 5, 20)) +>B : Symbol(B, Decl(genericInheritedDefaultConstructors.ts, 5, 20)) + +var x = new B(); +>x : Symbol(x, Decl(genericInheritedDefaultConstructors.ts, 8, 3)) +>B : Symbol(B, Decl(genericInheritedDefaultConstructors.ts, 5, 20)) + +//class A1 { a: boolean; } +//class B1 extends A1 { b: boolean; } +//var c1:Constructor = B1; // no error here + diff --git a/tests/baselines/reference/genericInheritedImplicitConstructors.types b/tests/baselines/reference/genericInheritedDefaultConstructors.types similarity index 73% rename from tests/baselines/reference/genericInheritedImplicitConstructors.types rename to tests/baselines/reference/genericInheritedDefaultConstructors.types index 3535cd95de..0f68e9d7ec 100644 --- a/tests/baselines/reference/genericInheritedImplicitConstructors.types +++ b/tests/baselines/reference/genericInheritedDefaultConstructors.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/genericInheritedImplicitConstructors.ts === +=== tests/cases/compiler/genericInheritedDefaultConstructors.ts === interface Constructor { >Constructor : Constructor >T : T @@ -32,6 +32,11 @@ var c:Constructor> = B; // error here >B : B >B : typeof B +var x = new B(); +>x : B +>new B() : B +>B : typeof B + //class A1 { a: boolean; } //class B1 extends A1 { b: boolean; } //var c1:Constructor = B1; // no error here diff --git a/tests/baselines/reference/genericInheritedImplicitConstructors.symbols b/tests/baselines/reference/genericInheritedImplicitConstructors.symbols deleted file mode 100644 index 82a13ff05f..0000000000 --- a/tests/baselines/reference/genericInheritedImplicitConstructors.symbols +++ /dev/null @@ -1,38 +0,0 @@ -=== tests/cases/compiler/genericInheritedImplicitConstructors.ts === -interface Constructor { ->Constructor : Symbol(Constructor, Decl(genericInheritedImplicitConstructors.ts, 0, 0)) ->T : Symbol(T, Decl(genericInheritedImplicitConstructors.ts, 0, 22)) - - new(...args: any[]): T; ->args : Symbol(args, Decl(genericInheritedImplicitConstructors.ts, 1, 8)) ->T : Symbol(T, Decl(genericInheritedImplicitConstructors.ts, 0, 22)) - - prototype: T; ->prototype : Symbol(Constructor.prototype, Decl(genericInheritedImplicitConstructors.ts, 1, 27)) ->T : Symbol(T, Decl(genericInheritedImplicitConstructors.ts, 0, 22)) -} - -class A { a: U; } ->A : Symbol(A, Decl(genericInheritedImplicitConstructors.ts, 3, 1)) ->U : Symbol(U, Decl(genericInheritedImplicitConstructors.ts, 5, 8)) ->a : Symbol(A.a, Decl(genericInheritedImplicitConstructors.ts, 5, 12)) ->U : Symbol(U, Decl(genericInheritedImplicitConstructors.ts, 5, 8)) - -class B extends A { b: V; } ->B : Symbol(B, Decl(genericInheritedImplicitConstructors.ts, 5, 20)) ->V : Symbol(V, Decl(genericInheritedImplicitConstructors.ts, 6, 8)) ->A : Symbol(A, Decl(genericInheritedImplicitConstructors.ts, 3, 1)) ->V : Symbol(V, Decl(genericInheritedImplicitConstructors.ts, 6, 8)) ->b : Symbol(B.b, Decl(genericInheritedImplicitConstructors.ts, 6, 25)) ->V : Symbol(V, Decl(genericInheritedImplicitConstructors.ts, 6, 8)) - -var c:Constructor> = B; // error here ->c : Symbol(c, Decl(genericInheritedImplicitConstructors.ts, 7, 3)) ->Constructor : Symbol(Constructor, Decl(genericInheritedImplicitConstructors.ts, 0, 0)) ->B : Symbol(B, Decl(genericInheritedImplicitConstructors.ts, 5, 20)) ->B : Symbol(B, Decl(genericInheritedImplicitConstructors.ts, 5, 20)) - -//class A1 { a: boolean; } -//class B1 extends A1 { b: boolean; } -//var c1:Constructor = B1; // no error here -