Skip to content

Commit 60b8d0a

Browse files
committed
Clean up tests a bit
1 parent ae63df6 commit 60b8d0a

File tree

4 files changed

+28
-55
lines changed

4 files changed

+28
-55
lines changed

tests/baselines/reference/genericInheritedDefaultConstructors.js

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
//// [genericInheritedDefaultConstructors.ts]
2+
// repro from #8166
23
interface Constructor<T> {
34
new(...args: any[]): T;
45
prototype: T;
56
}
67

78
class A<U> { a: U; }
89
class B<V> extends A<V> { b: V; }
9-
var c:Constructor<B<boolean>> = B; // error here
10-
var x = new B<number>();
11-
12-
//class A1 { a: boolean; }
13-
//class B1 extends A1 { b: boolean; }
14-
//var c1:Constructor<B1> = B1; // no error here
10+
var c:Constructor<B<boolean>> = B; // shouldn't error here
1511

1612

1713
//// [genericInheritedDefaultConstructors.js]
@@ -32,8 +28,4 @@ var B = (function (_super) {
3228
}
3329
return B;
3430
}(A));
35-
var c = B; // error here
36-
var x = new B();
37-
//class A1 { a: boolean; }
38-
//class B1 extends A1 { b: boolean; }
39-
//var c1:Constructor<B1> = B1; // no error here
31+
var c = B; // shouldn't error here
Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,35 @@
11
=== tests/cases/compiler/genericInheritedDefaultConstructors.ts ===
2+
// repro from #8166
23
interface Constructor<T> {
34
>Constructor : Symbol(Constructor, Decl(genericInheritedDefaultConstructors.ts, 0, 0))
4-
>T : Symbol(T, Decl(genericInheritedDefaultConstructors.ts, 0, 22))
5+
>T : Symbol(T, Decl(genericInheritedDefaultConstructors.ts, 1, 22))
56

67
new(...args: any[]): T;
7-
>args : Symbol(args, Decl(genericInheritedDefaultConstructors.ts, 1, 8))
8-
>T : Symbol(T, Decl(genericInheritedDefaultConstructors.ts, 0, 22))
8+
>args : Symbol(args, Decl(genericInheritedDefaultConstructors.ts, 2, 8))
9+
>T : Symbol(T, Decl(genericInheritedDefaultConstructors.ts, 1, 22))
910

1011
prototype: T;
11-
>prototype : Symbol(Constructor.prototype, Decl(genericInheritedDefaultConstructors.ts, 1, 27))
12-
>T : Symbol(T, Decl(genericInheritedDefaultConstructors.ts, 0, 22))
12+
>prototype : Symbol(Constructor.prototype, Decl(genericInheritedDefaultConstructors.ts, 2, 27))
13+
>T : Symbol(T, Decl(genericInheritedDefaultConstructors.ts, 1, 22))
1314
}
1415

1516
class A<U> { a: U; }
16-
>A : Symbol(A, Decl(genericInheritedDefaultConstructors.ts, 3, 1))
17-
>U : Symbol(U, Decl(genericInheritedDefaultConstructors.ts, 5, 8))
18-
>a : Symbol(A.a, Decl(genericInheritedDefaultConstructors.ts, 5, 12))
19-
>U : Symbol(U, Decl(genericInheritedDefaultConstructors.ts, 5, 8))
17+
>A : Symbol(A, Decl(genericInheritedDefaultConstructors.ts, 4, 1))
18+
>U : Symbol(U, Decl(genericInheritedDefaultConstructors.ts, 6, 8))
19+
>a : Symbol(A.a, Decl(genericInheritedDefaultConstructors.ts, 6, 12))
20+
>U : Symbol(U, Decl(genericInheritedDefaultConstructors.ts, 6, 8))
2021

2122
class B<V> extends A<V> { b: V; }
22-
>B : Symbol(B, Decl(genericInheritedDefaultConstructors.ts, 5, 20))
23-
>V : Symbol(V, Decl(genericInheritedDefaultConstructors.ts, 6, 8))
24-
>A : Symbol(A, Decl(genericInheritedDefaultConstructors.ts, 3, 1))
25-
>V : Symbol(V, Decl(genericInheritedDefaultConstructors.ts, 6, 8))
26-
>b : Symbol(B.b, Decl(genericInheritedDefaultConstructors.ts, 6, 25))
27-
>V : Symbol(V, Decl(genericInheritedDefaultConstructors.ts, 6, 8))
28-
29-
var c:Constructor<B<boolean>> = B; // error here
30-
>c : Symbol(c, Decl(genericInheritedDefaultConstructors.ts, 7, 3))
23+
>B : Symbol(B, Decl(genericInheritedDefaultConstructors.ts, 6, 20))
24+
>V : Symbol(V, Decl(genericInheritedDefaultConstructors.ts, 7, 8))
25+
>A : Symbol(A, Decl(genericInheritedDefaultConstructors.ts, 4, 1))
26+
>V : Symbol(V, Decl(genericInheritedDefaultConstructors.ts, 7, 8))
27+
>b : Symbol(B.b, Decl(genericInheritedDefaultConstructors.ts, 7, 25))
28+
>V : Symbol(V, Decl(genericInheritedDefaultConstructors.ts, 7, 8))
29+
30+
var c:Constructor<B<boolean>> = B; // shouldn't error here
31+
>c : Symbol(c, Decl(genericInheritedDefaultConstructors.ts, 8, 3))
3132
>Constructor : Symbol(Constructor, Decl(genericInheritedDefaultConstructors.ts, 0, 0))
32-
>B : Symbol(B, Decl(genericInheritedDefaultConstructors.ts, 5, 20))
33-
>B : Symbol(B, Decl(genericInheritedDefaultConstructors.ts, 5, 20))
34-
35-
var x = new B<number>();
36-
>x : Symbol(x, Decl(genericInheritedDefaultConstructors.ts, 8, 3))
37-
>B : Symbol(B, Decl(genericInheritedDefaultConstructors.ts, 5, 20))
38-
39-
//class A1 { a: boolean; }
40-
//class B1 extends A1 { b: boolean; }
41-
//var c1:Constructor<B1> = B1; // no error here
33+
>B : Symbol(B, Decl(genericInheritedDefaultConstructors.ts, 6, 20))
34+
>B : Symbol(B, Decl(genericInheritedDefaultConstructors.ts, 6, 20))
4235

tests/baselines/reference/genericInheritedDefaultConstructors.types

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
=== tests/cases/compiler/genericInheritedDefaultConstructors.ts ===
2+
// repro from #8166
23
interface Constructor<T> {
34
>Constructor : Constructor<T>
45
>T : T
@@ -26,18 +27,9 @@ class B<V> extends A<V> { b: V; }
2627
>b : V
2728
>V : V
2829

29-
var c:Constructor<B<boolean>> = B; // error here
30+
var c:Constructor<B<boolean>> = B; // shouldn't error here
3031
>c : Constructor<B<boolean>>
3132
>Constructor : Constructor<T>
3233
>B : B<V>
3334
>B : typeof B
3435

35-
var x = new B<number>();
36-
>x : B<number>
37-
>new B<number>() : B<number>
38-
>B : typeof B
39-
40-
//class A1 { a: boolean; }
41-
//class B1 extends A1 { b: boolean; }
42-
//var c1:Constructor<B1> = B1; // no error here
43-
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1+
// repro from #8166
12
interface Constructor<T> {
23
new(...args: any[]): T;
34
prototype: T;
45
}
56

67
class A<U> { a: U; }
78
class B<V> extends A<V> { b: V; }
8-
var c:Constructor<B<boolean>> = B; // error here
9-
var x = new B<number>();
10-
11-
//class A1 { a: boolean; }
12-
//class B1 extends A1 { b: boolean; }
13-
//var c1:Constructor<B1> = B1; // no error here
9+
var c:Constructor<B<boolean>> = B; // shouldn't error here

0 commit comments

Comments
 (0)