From db76a9ca0720199852c39eef1c8956d5c55bacb7 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Sat, 15 Oct 2016 17:29:03 -0700
Subject: [PATCH] More tests

---
 .../transformsElideNullUndefinedType.js       |  68 ++++++++++--
 .../transformsElideNullUndefinedType.symbols  | 101 ++++++++++++++---
 .../transformsElideNullUndefinedType.types    | 102 ++++++++++++++++--
 .../transformsElideNullUndefinedType.ts       |  36 ++++++-
 4 files changed, 272 insertions(+), 35 deletions(-)

diff --git a/tests/baselines/reference/transformsElideNullUndefinedType.js b/tests/baselines/reference/transformsElideNullUndefinedType.js
index a5e27eee08b..63bc77559c1 100644
--- a/tests/baselines/reference/transformsElideNullUndefinedType.js
+++ b/tests/baselines/reference/transformsElideNullUndefinedType.js
@@ -15,21 +15,49 @@ var f5 = (): undefined => undefined;
 function f6(p0: null) { }
 function f7(p1: undefined) { }
 
-class C<T> {
+var f8 = function (p2: null) { }
+var f9 = function (p3: undefined) { }
+
+var f10 = (p4: null) => { }
+var f11 = (p5: undefined) => { }
+
+class C1 {
     m0(): null { return null; }
     m1(): undefined { return undefined; }
 
+    m3(p6: null) { }
+    m4(p7: undefined) { }
+
     get a0(): null { return null; }
     get a1(): undefined { return undefined; }
+
+    set a2(p8: null) { }
+    set a3(p9: undefined) { }
 }
 
-declare function fn<T>();
+class C2 { constructor(p10: null) { } }
+class C3 { constructor(p11: undefined) { } }
 
+class C4 {
+    f1;
+    constructor(p12: null) { }
+}
+
+class C5 {
+    f2;
+    constructor(p13: undefined) { }
+}
+
+var C6 = class { constructor(p12: null) { } }
+var C7 = class { constructor(p13: undefined) { } }
+
+declare function fn<T>();
 fn<null>();
 fn<undefined>();
 
-new C<null>();
-new C<undefined>();
+declare class D<T> {}
+new D<null>();
+new D<undefined>();
 
 //// [transformsElideNullUndefinedType.js]
 var v0;
@@ -42,13 +70,39 @@ var f4 = () => null;
 var f5 = () => undefined;
 function f6(p0) { }
 function f7(p1) { }
-class C {
+var f8 = function (p2) { };
+var f9 = function (p3) { };
+var f10 = (p4) => { };
+var f11 = (p5) => { };
+class C1 {
     m0() { return null; }
     m1() { return undefined; }
+    m3(p6) { }
+    m4(p7) { }
     get a0() { return null; }
     get a1() { return undefined; }
+    set a2(p8) { }
+    set a3(p9) { }
 }
+class C2 {
+    constructor(p10) { }
+}
+class C3 {
+    constructor(p11) { }
+}
+class C4 {
+    constructor(p12) { }
+}
+class C5 {
+    constructor(p13) { }
+}
+var C6 = class {
+    constructor(p12) { }
+};
+var C7 = class {
+    constructor(p13) { }
+};
 fn();
 fn();
-new C();
-new C();
+new D();
+new D();
diff --git a/tests/baselines/reference/transformsElideNullUndefinedType.symbols b/tests/baselines/reference/transformsElideNullUndefinedType.symbols
index 0c9333d9820..b651784a61c 100644
--- a/tests/baselines/reference/transformsElideNullUndefinedType.symbols
+++ b/tests/baselines/reference/transformsElideNullUndefinedType.symbols
@@ -35,38 +35,109 @@ function f7(p1: undefined) { }
 >f7 : Symbol(f7, Decl(transformsElideNullUndefinedType.ts, 13, 25))
 >p1 : Symbol(p1, Decl(transformsElideNullUndefinedType.ts, 14, 12))
 
-class C<T> {
->C : Symbol(C, Decl(transformsElideNullUndefinedType.ts, 14, 30))
->T : Symbol(T, Decl(transformsElideNullUndefinedType.ts, 16, 8))
+var f8 = function (p2: null) { }
+>f8 : Symbol(f8, Decl(transformsElideNullUndefinedType.ts, 16, 3))
+>p2 : Symbol(p2, Decl(transformsElideNullUndefinedType.ts, 16, 19))
+
+var f9 = function (p3: undefined) { }
+>f9 : Symbol(f9, Decl(transformsElideNullUndefinedType.ts, 17, 3))
+>p3 : Symbol(p3, Decl(transformsElideNullUndefinedType.ts, 17, 19))
+
+var f10 = (p4: null) => { }
+>f10 : Symbol(f10, Decl(transformsElideNullUndefinedType.ts, 19, 3))
+>p4 : Symbol(p4, Decl(transformsElideNullUndefinedType.ts, 19, 11))
+
+var f11 = (p5: undefined) => { }
+>f11 : Symbol(f11, Decl(transformsElideNullUndefinedType.ts, 20, 3))
+>p5 : Symbol(p5, Decl(transformsElideNullUndefinedType.ts, 20, 11))
+
+class C1 {
+>C1 : Symbol(C1, Decl(transformsElideNullUndefinedType.ts, 20, 32))
 
     m0(): null { return null; }
->m0 : Symbol(C.m0, Decl(transformsElideNullUndefinedType.ts, 16, 12))
+>m0 : Symbol(C1.m0, Decl(transformsElideNullUndefinedType.ts, 22, 10))
 
     m1(): undefined { return undefined; }
->m1 : Symbol(C.m1, Decl(transformsElideNullUndefinedType.ts, 17, 31))
+>m1 : Symbol(C1.m1, Decl(transformsElideNullUndefinedType.ts, 23, 31))
 >undefined : Symbol(undefined)
 
+    m3(p6: null) { }
+>m3 : Symbol(C1.m3, Decl(transformsElideNullUndefinedType.ts, 24, 41))
+>p6 : Symbol(p6, Decl(transformsElideNullUndefinedType.ts, 26, 7))
+
+    m4(p7: undefined) { }
+>m4 : Symbol(C1.m4, Decl(transformsElideNullUndefinedType.ts, 26, 20))
+>p7 : Symbol(p7, Decl(transformsElideNullUndefinedType.ts, 27, 7))
+
     get a0(): null { return null; }
->a0 : Symbol(C.a0, Decl(transformsElideNullUndefinedType.ts, 18, 41))
+>a0 : Symbol(C1.a0, Decl(transformsElideNullUndefinedType.ts, 27, 25))
 
     get a1(): undefined { return undefined; }
->a1 : Symbol(C.a1, Decl(transformsElideNullUndefinedType.ts, 20, 35))
+>a1 : Symbol(C1.a1, Decl(transformsElideNullUndefinedType.ts, 29, 35))
 >undefined : Symbol(undefined)
+
+    set a2(p8: null) { }
+>a2 : Symbol(C1.a2, Decl(transformsElideNullUndefinedType.ts, 30, 45))
+>p8 : Symbol(p8, Decl(transformsElideNullUndefinedType.ts, 32, 11))
+
+    set a3(p9: undefined) { }
+>a3 : Symbol(C1.a3, Decl(transformsElideNullUndefinedType.ts, 32, 24))
+>p9 : Symbol(p9, Decl(transformsElideNullUndefinedType.ts, 33, 11))
 }
 
+class C2 { constructor(p10: null) { } }
+>C2 : Symbol(C2, Decl(transformsElideNullUndefinedType.ts, 34, 1))
+>p10 : Symbol(p10, Decl(transformsElideNullUndefinedType.ts, 36, 23))
+
+class C3 { constructor(p11: undefined) { } }
+>C3 : Symbol(C3, Decl(transformsElideNullUndefinedType.ts, 36, 39))
+>p11 : Symbol(p11, Decl(transformsElideNullUndefinedType.ts, 37, 23))
+
+class C4 {
+>C4 : Symbol(C4, Decl(transformsElideNullUndefinedType.ts, 37, 44))
+
+    f1;
+>f1 : Symbol(C4.f1, Decl(transformsElideNullUndefinedType.ts, 39, 10))
+
+    constructor(p12: null) { }
+>p12 : Symbol(p12, Decl(transformsElideNullUndefinedType.ts, 41, 16))
+}
+
+class C5 {
+>C5 : Symbol(C5, Decl(transformsElideNullUndefinedType.ts, 42, 1))
+
+    f2;
+>f2 : Symbol(C5.f2, Decl(transformsElideNullUndefinedType.ts, 44, 10))
+
+    constructor(p13: undefined) { }
+>p13 : Symbol(p13, Decl(transformsElideNullUndefinedType.ts, 46, 16))
+}
+
+var C6 = class { constructor(p12: null) { } }
+>C6 : Symbol(C6, Decl(transformsElideNullUndefinedType.ts, 49, 3))
+>p12 : Symbol(p12, Decl(transformsElideNullUndefinedType.ts, 49, 29))
+
+var C7 = class { constructor(p13: undefined) { } }
+>C7 : Symbol(C7, Decl(transformsElideNullUndefinedType.ts, 50, 3))
+>p13 : Symbol(p13, Decl(transformsElideNullUndefinedType.ts, 50, 29))
+
 declare function fn<T>();
->fn : Symbol(fn, Decl(transformsElideNullUndefinedType.ts, 22, 1))
->T : Symbol(T, Decl(transformsElideNullUndefinedType.ts, 24, 20))
+>fn : Symbol(fn, Decl(transformsElideNullUndefinedType.ts, 50, 50))
+>T : Symbol(T, Decl(transformsElideNullUndefinedType.ts, 52, 20))
 
 fn<null>();
->fn : Symbol(fn, Decl(transformsElideNullUndefinedType.ts, 22, 1))
+>fn : Symbol(fn, Decl(transformsElideNullUndefinedType.ts, 50, 50))
 
 fn<undefined>();
->fn : Symbol(fn, Decl(transformsElideNullUndefinedType.ts, 22, 1))
+>fn : Symbol(fn, Decl(transformsElideNullUndefinedType.ts, 50, 50))
 
-new C<null>();
->C : Symbol(C, Decl(transformsElideNullUndefinedType.ts, 14, 30))
+declare class D<T> {}
+>D : Symbol(D, Decl(transformsElideNullUndefinedType.ts, 54, 16))
+>T : Symbol(T, Decl(transformsElideNullUndefinedType.ts, 56, 16))
 
-new C<undefined>();
->C : Symbol(C, Decl(transformsElideNullUndefinedType.ts, 14, 30))
+new D<null>();
+>D : Symbol(D, Decl(transformsElideNullUndefinedType.ts, 54, 16))
+
+new D<undefined>();
+>D : Symbol(D, Decl(transformsElideNullUndefinedType.ts, 54, 16))
 
diff --git a/tests/baselines/reference/transformsElideNullUndefinedType.types b/tests/baselines/reference/transformsElideNullUndefinedType.types
index 66a73c83141..7f48d8a00e9 100644
--- a/tests/baselines/reference/transformsElideNullUndefinedType.types
+++ b/tests/baselines/reference/transformsElideNullUndefinedType.types
@@ -47,9 +47,30 @@ function f7(p1: undefined) { }
 >f7 : (p1: undefined) => void
 >p1 : undefined
 
-class C<T> {
->C : C<T>
->T : T
+var f8 = function (p2: null) { }
+>f8 : (p2: null) => void
+>function (p2: null) { } : (p2: null) => void
+>p2 : null
+>null : null
+
+var f9 = function (p3: undefined) { }
+>f9 : (p3: undefined) => void
+>function (p3: undefined) { } : (p3: undefined) => void
+>p3 : undefined
+
+var f10 = (p4: null) => { }
+>f10 : (p4: null) => void
+>(p4: null) => { } : (p4: null) => void
+>p4 : null
+>null : null
+
+var f11 = (p5: undefined) => { }
+>f11 : (p5: undefined) => void
+>(p5: undefined) => { } : (p5: undefined) => void
+>p5 : undefined
+
+class C1 {
+>C1 : C1
 
     m0(): null { return null; }
 >m0 : () => null
@@ -60,6 +81,15 @@ class C<T> {
 >m1 : () => undefined
 >undefined : undefined
 
+    m3(p6: null) { }
+>m3 : (p6: null) => void
+>p6 : null
+>null : null
+
+    m4(p7: undefined) { }
+>m4 : (p7: undefined) => void
+>p7 : undefined
+
     get a0(): null { return null; }
 >a0 : null
 >null : null
@@ -68,8 +98,58 @@ class C<T> {
     get a1(): undefined { return undefined; }
 >a1 : undefined
 >undefined : undefined
+
+    set a2(p8: null) { }
+>a2 : null
+>p8 : null
+>null : null
+
+    set a3(p9: undefined) { }
+>a3 : undefined
+>p9 : undefined
 }
 
+class C2 { constructor(p10: null) { } }
+>C2 : C2
+>p10 : null
+>null : null
+
+class C3 { constructor(p11: undefined) { } }
+>C3 : C3
+>p11 : undefined
+
+class C4 {
+>C4 : C4
+
+    f1;
+>f1 : any
+
+    constructor(p12: null) { }
+>p12 : null
+>null : null
+}
+
+class C5 {
+>C5 : C5
+
+    f2;
+>f2 : any
+
+    constructor(p13: undefined) { }
+>p13 : undefined
+}
+
+var C6 = class { constructor(p12: null) { } }
+>C6 : typeof (Anonymous class)
+>class { constructor(p12: null) { } } : typeof (Anonymous class)
+>p12 : null
+>null : null
+
+var C7 = class { constructor(p13: undefined) { } }
+>C7 : typeof (Anonymous class)
+>class { constructor(p13: undefined) { } } : typeof (Anonymous class)
+>p13 : undefined
+
 declare function fn<T>();
 >fn : <T>() => any
 >T : T
@@ -83,12 +163,16 @@ fn<undefined>();
 >fn<undefined>() : any
 >fn : <T>() => any
 
-new C<null>();
->new C<null>() : C<null>
->C : typeof C
+declare class D<T> {}
+>D : D<T>
+>T : T
+
+new D<null>();
+>new D<null>() : D<null>
+>D : typeof D
 >null : null
 
-new C<undefined>();
->new C<undefined>() : C<undefined>
->C : typeof C
+new D<undefined>();
+>new D<undefined>() : D<undefined>
+>D : typeof D
 
diff --git a/tests/cases/compiler/transformsElideNullUndefinedType.ts b/tests/cases/compiler/transformsElideNullUndefinedType.ts
index 244f2ea9c75..4a493a91d88 100644
--- a/tests/cases/compiler/transformsElideNullUndefinedType.ts
+++ b/tests/cases/compiler/transformsElideNullUndefinedType.ts
@@ -15,18 +15,46 @@ var f5 = (): undefined => undefined;
 function f6(p0: null) { }
 function f7(p1: undefined) { }
 
-class C<T> {
+var f8 = function (p2: null) { }
+var f9 = function (p3: undefined) { }
+
+var f10 = (p4: null) => { }
+var f11 = (p5: undefined) => { }
+
+class C1 {
     m0(): null { return null; }
     m1(): undefined { return undefined; }
 
+    m3(p6: null) { }
+    m4(p7: undefined) { }
+
     get a0(): null { return null; }
     get a1(): undefined { return undefined; }
+
+    set a2(p8: null) { }
+    set a3(p9: undefined) { }
 }
 
-declare function fn<T>();
+class C2 { constructor(p10: null) { } }
+class C3 { constructor(p11: undefined) { } }
 
+class C4 {
+    f1;
+    constructor(p12: null) { }
+}
+
+class C5 {
+    f2;
+    constructor(p13: undefined) { }
+}
+
+var C6 = class { constructor(p12: null) { } }
+var C7 = class { constructor(p13: undefined) { } }
+
+declare function fn<T>();
 fn<null>();
 fn<undefined>();
 
-new C<null>();
-new C<undefined>();
\ No newline at end of file
+declare class D<T> {}
+new D<null>();
+new D<undefined>();
\ No newline at end of file