From 323ce242877219127a6b388d18dcc9b003791cbb Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa@umich.edu>
Date: Wed, 3 Jun 2015 14:28:18 -0700
Subject: [PATCH] new baselines got mergeClassInterfaceAndModule

---
 .../reference/mergeClassInterfaceAndModule.js | 19 ++++++++++
 .../mergeClassInterfaceAndModule.symbols      | 38 +++++++++++++++++++
 .../mergeClassInterfaceAndModule.types        | 38 +++++++++++++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 tests/baselines/reference/mergeClassInterfaceAndModule.js
 create mode 100644 tests/baselines/reference/mergeClassInterfaceAndModule.symbols
 create mode 100644 tests/baselines/reference/mergeClassInterfaceAndModule.types

diff --git a/tests/baselines/reference/mergeClassInterfaceAndModule.js b/tests/baselines/reference/mergeClassInterfaceAndModule.js
new file mode 100644
index 00000000000..5b7315031cd
--- /dev/null
+++ b/tests/baselines/reference/mergeClassInterfaceAndModule.js
@@ -0,0 +1,19 @@
+//// [mergeClassInterfaceAndModule.ts]
+
+interface C1 {}
+declare class C1 {}
+module C1 {}
+
+declare class C2 {}
+interface C2 {}
+module C2 {}
+
+declare class C3 {}
+module C3 {}
+interface C3 {}
+
+module C4 {}
+declare class C4 {} // error -- class declaration must preceed module declaration
+interface C4 {}
+
+//// [mergeClassInterfaceAndModule.js]
diff --git a/tests/baselines/reference/mergeClassInterfaceAndModule.symbols b/tests/baselines/reference/mergeClassInterfaceAndModule.symbols
new file mode 100644
index 00000000000..a10227ed461
--- /dev/null
+++ b/tests/baselines/reference/mergeClassInterfaceAndModule.symbols
@@ -0,0 +1,38 @@
+=== tests/cases/conformance/classes/classDeclarations/mergeClassInterfaceAndModule.ts ===
+
+interface C1 {}
+>C1 : Symbol(C1, Decl(mergeClassInterfaceAndModule.ts, 0, 0), Decl(mergeClassInterfaceAndModule.ts, 1, 15), Decl(mergeClassInterfaceAndModule.ts, 2, 19))
+
+declare class C1 {}
+>C1 : Symbol(C1, Decl(mergeClassInterfaceAndModule.ts, 0, 0), Decl(mergeClassInterfaceAndModule.ts, 1, 15), Decl(mergeClassInterfaceAndModule.ts, 2, 19))
+
+module C1 {}
+>C1 : Symbol(C1, Decl(mergeClassInterfaceAndModule.ts, 0, 0), Decl(mergeClassInterfaceAndModule.ts, 1, 15), Decl(mergeClassInterfaceAndModule.ts, 2, 19))
+
+declare class C2 {}
+>C2 : Symbol(C2, Decl(mergeClassInterfaceAndModule.ts, 3, 12), Decl(mergeClassInterfaceAndModule.ts, 5, 19), Decl(mergeClassInterfaceAndModule.ts, 6, 15))
+
+interface C2 {}
+>C2 : Symbol(C2, Decl(mergeClassInterfaceAndModule.ts, 3, 12), Decl(mergeClassInterfaceAndModule.ts, 5, 19), Decl(mergeClassInterfaceAndModule.ts, 6, 15))
+
+module C2 {}
+>C2 : Symbol(C2, Decl(mergeClassInterfaceAndModule.ts, 3, 12), Decl(mergeClassInterfaceAndModule.ts, 5, 19), Decl(mergeClassInterfaceAndModule.ts, 6, 15))
+
+declare class C3 {}
+>C3 : Symbol(C3, Decl(mergeClassInterfaceAndModule.ts, 7, 12), Decl(mergeClassInterfaceAndModule.ts, 9, 19), Decl(mergeClassInterfaceAndModule.ts, 10, 12))
+
+module C3 {}
+>C3 : Symbol(C3, Decl(mergeClassInterfaceAndModule.ts, 7, 12), Decl(mergeClassInterfaceAndModule.ts, 9, 19), Decl(mergeClassInterfaceAndModule.ts, 10, 12))
+
+interface C3 {}
+>C3 : Symbol(C3, Decl(mergeClassInterfaceAndModule.ts, 7, 12), Decl(mergeClassInterfaceAndModule.ts, 9, 19), Decl(mergeClassInterfaceAndModule.ts, 10, 12))
+
+module C4 {}
+>C4 : Symbol(C4, Decl(mergeClassInterfaceAndModule.ts, 11, 15), Decl(mergeClassInterfaceAndModule.ts, 13, 12), Decl(mergeClassInterfaceAndModule.ts, 14, 19))
+
+declare class C4 {} // error -- class declaration must preceed module declaration
+>C4 : Symbol(C4, Decl(mergeClassInterfaceAndModule.ts, 11, 15), Decl(mergeClassInterfaceAndModule.ts, 13, 12), Decl(mergeClassInterfaceAndModule.ts, 14, 19))
+
+interface C4 {}
+>C4 : Symbol(C4, Decl(mergeClassInterfaceAndModule.ts, 11, 15), Decl(mergeClassInterfaceAndModule.ts, 13, 12), Decl(mergeClassInterfaceAndModule.ts, 14, 19))
+
diff --git a/tests/baselines/reference/mergeClassInterfaceAndModule.types b/tests/baselines/reference/mergeClassInterfaceAndModule.types
new file mode 100644
index 00000000000..a91691e5bac
--- /dev/null
+++ b/tests/baselines/reference/mergeClassInterfaceAndModule.types
@@ -0,0 +1,38 @@
+=== tests/cases/conformance/classes/classDeclarations/mergeClassInterfaceAndModule.ts ===
+
+interface C1 {}
+>C1 : C1
+
+declare class C1 {}
+>C1 : C1
+
+module C1 {}
+>C1 : typeof C1
+
+declare class C2 {}
+>C2 : C2
+
+interface C2 {}
+>C2 : C2
+
+module C2 {}
+>C2 : typeof C2
+
+declare class C3 {}
+>C3 : C3
+
+module C3 {}
+>C3 : typeof C3
+
+interface C3 {}
+>C3 : C3
+
+module C4 {}
+>C4 : typeof C4
+
+declare class C4 {} // error -- class declaration must preceed module declaration
+>C4 : C4
+
+interface C4 {}
+>C4 : C4
+