From 3a3479d7e2ed9fd17c0ea096825143678b9f186f Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa@umich.edu>
Date: Thu, 4 Jun 2015 11:08:13 -0700
Subject: [PATCH] New Test and Baseline

---
 ...sImplementsMergedClassInterface.errors.txt | 41 +++++++++++++++++
 .../classImplementsMergedClassInterface.js    | 46 +++++++++++++++++++
 .../classImplementsMergedClassInterface.ts    | 23 ++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 tests/baselines/reference/classImplementsMergedClassInterface.errors.txt
 create mode 100644 tests/baselines/reference/classImplementsMergedClassInterface.js
 create mode 100644 tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts

diff --git a/tests/baselines/reference/classImplementsMergedClassInterface.errors.txt b/tests/baselines/reference/classImplementsMergedClassInterface.errors.txt
new file mode 100644
index 00000000000..3e62e72be84
--- /dev/null
+++ b/tests/baselines/reference/classImplementsMergedClassInterface.errors.txt
@@ -0,0 +1,41 @@
+tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts(9,7): error TS2420: Class 'C2' incorrectly implements interface 'C1'.
+  Property 'x' is missing in type 'C2'.
+tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts(12,7): error TS2420: Class 'C3' incorrectly implements interface 'C1'.
+  Property 'y' is missing in type 'C3'.
+tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts(16,7): error TS2420: Class 'C4' incorrectly implements interface 'C1'.
+  Property 'x' is missing in type 'C4'.
+
+
+==== tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts (3 errors) ====
+    declare class C1 {
+        x : number;
+    }
+    
+    interface C1 {
+        y : number;
+    }
+    
+    class C2 implements C1 { // error -- missing x
+          ~~
+!!! error TS2420: Class 'C2' incorrectly implements interface 'C1'.
+!!! error TS2420:   Property 'x' is missing in type 'C2'.
+    }
+    
+    class C3 implements C1 { // error -- missing y
+          ~~
+!!! error TS2420: Class 'C3' incorrectly implements interface 'C1'.
+!!! error TS2420:   Property 'y' is missing in type 'C3'.
+        x : number;
+    }
+    
+    class C4 implements C1 { // error -- missing x
+          ~~
+!!! error TS2420: Class 'C4' incorrectly implements interface 'C1'.
+!!! error TS2420:   Property 'x' is missing in type 'C4'.
+        y : number;
+    }
+    
+    class C5 implements C1 { // okay
+        x : number;
+        y : number;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/classImplementsMergedClassInterface.js b/tests/baselines/reference/classImplementsMergedClassInterface.js
new file mode 100644
index 00000000000..64a0198cc16
--- /dev/null
+++ b/tests/baselines/reference/classImplementsMergedClassInterface.js
@@ -0,0 +1,46 @@
+//// [classImplementsMergedClassInterface.ts]
+declare class C1 {
+    x : number;
+}
+
+interface C1 {
+    y : number;
+}
+
+class C2 implements C1 { // error -- missing x
+}
+
+class C3 implements C1 { // error -- missing y
+    x : number;
+}
+
+class C4 implements C1 { // error -- missing x
+    y : number;
+}
+
+class C5 implements C1 { // okay
+    x : number;
+    y : number;
+}
+
+//// [classImplementsMergedClassInterface.js]
+var C2 = (function () {
+    function C2() {
+    }
+    return C2;
+})();
+var C3 = (function () {
+    function C3() {
+    }
+    return C3;
+})();
+var C4 = (function () {
+    function C4() {
+    }
+    return C4;
+})();
+var C5 = (function () {
+    function C5() {
+    }
+    return C5;
+})();
diff --git a/tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts b/tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts
new file mode 100644
index 00000000000..d5ac1b005bf
--- /dev/null
+++ b/tests/cases/conformance/classes/classDeclarations/classImplementsMergedClassInterface.ts
@@ -0,0 +1,23 @@
+declare class C1 {
+    x : number;
+}
+
+interface C1 {
+    y : number;
+}
+
+class C2 implements C1 { // error -- missing x
+}
+
+class C3 implements C1 { // error -- missing y
+    x : number;
+}
+
+class C4 implements C1 { // error -- missing x
+    y : number;
+}
+
+class C5 implements C1 { // okay
+    x : number;
+    y : number;
+}
\ No newline at end of file